Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
zulip/zerver/lib/avatar.py

30 lines
1.0 KiB
Python
Raw Normal View History

Enable absolute imports. See PEP 328[1] for details. This feature was introduced in Python 2.5 and will become mandatory in Python 3. [1]: http://www.python.org/dev/peps/pep-0328 (imported from commit 7444eeba8a08d5f91b94c7921848f2274979bd76)
2013-04-23 18:51:17 +02:00
from __future__ import absolute_import
Show user-uploaded avatars on the website. Show user-uploaded avatars on the website for users who have UserProfile.avatar_source == 'U'. (Continue to show gravatars for other users.) This includes the home page, the visible-phone div, and the settings page. This fix does NOT address a few things: * There is no GUI to actually upload user images yet on the website. * The !gravatar syntax in bugdown will continue to show gravatar images only. * We are not changing identicon behavior. (imported from commit 9f5ac0bbe21ba56528048233aab2430e4dd431aa)
2013-06-10 21:35:48 +02:00
from django.conf import settings
Enable absolute imports. See PEP 328[1] for details. This feature was introduced in Python 2.5 and will become mandatory in Python 3. [1]: http://www.python.org/dev/peps/pep-0328 (imported from commit 7444eeba8a08d5f91b94c7921848f2274979bd76)
2013-04-23 18:51:17 +02:00
Add annotations to avatar.py, db.py, logging_util.py, unminify.py. Also, fixed a a small type annotation in users.py because email must be a string because emails don't support UTF-8 at this time (according a comment in gravatar_hash in avatar.py).
2016-06-05 04:20:00 +02:00
if False:
from zerver.models import UserProfile
mypy: Convert zerver/lib to use typing.Text.
2016-12-21 13:17:53 +01:00
from typing import Text
Factor out Gravatar hash calculation (imported from commit 29872722fb4856773d98fc987a1e2d6eb99ad8b2)
2012-10-17 04:07:35 +02:00
avatar: Move avatar hash computations to their own file.
2016-09-28 00:12:18 +02:00
from zerver.lib.avatar_hash import gravatar_hash, user_avatar_hash
Add medium size avatars for use on the user's own settings page. This adds a medium (500px) size avatar thumbnail, that can be referenced as `{name}-medium.png`. It is intended to be used on the user's own settings page, though we may come up with other use cases for high-resolution avatars in the future. This will automatically generate and upload the medium avatar images when a new avatar original is uploaded, and contains a migration (contributed by Kirill Kanakhin) to ensure all pre-existing avatar images have a medium avatar. Note that this implementation does not provide an endpoint for fetching the medium-size avatar for another user. [substantially modified by tabbott]
2016-09-20 21:48:48 +02:00
from zerver.lib.upload import upload_backend, MEDIUM_AVATAR_SIZE
Show user-uploaded avatars on the website. Show user-uploaded avatars on the website for users who have UserProfile.avatar_source == 'U'. (Continue to show gravatars for other users.) This includes the home page, the visible-phone div, and the settings page. This fix does NOT address a few things: * There is no GUI to actually upload user images yet on the website. * The !gravatar syntax in bugdown will continue to show gravatar images only. * We are not changing identicon behavior. (imported from commit 9f5ac0bbe21ba56528048233aab2430e4dd431aa)
2013-06-10 21:35:48 +02:00
Add medium size avatars for use on the user's own settings page. This adds a medium (500px) size avatar thumbnail, that can be referenced as `{name}-medium.png`. It is intended to be used on the user's own settings page, though we may come up with other use cases for high-resolution avatars in the future. This will automatically generate and upload the medium avatar images when a new avatar original is uploaded, and contains a migration (contributed by Kirill Kanakhin) to ensure all pre-existing avatar images have a medium avatar. Note that this implementation does not provide an endpoint for fetching the medium-size avatar for another user. [substantially modified by tabbott]
2016-09-20 21:48:48 +02:00
def avatar_url(user_profile, medium=False):
mypy: Convert zerver/lib to use typing.Text.
2016-12-21 13:17:53 +01:00
# type: (UserProfile, bool) -> Text
Extract get_avatar_url(). This function doesn't require the whole UserProfile object to create the avatar url, and we call it from Message.to_dict_uncached(). (imported from commit e814caab101c4fedd1ba66df041a3408014e4085)
2013-09-21 16:32:29 +02:00
return get_avatar_url(
lint: Clean up E126 PEP-8 rule.
2017-01-24 07:06:13 +01:00
user_profile.avatar_source,
user_profile.email,
medium=medium)
Extract get_avatar_url(). This function doesn't require the whole UserProfile object to create the avatar url, and we call it from Message.to_dict_uncached(). (imported from commit e814caab101c4fedd1ba66df041a3408014e4085)
2013-09-21 16:32:29 +02:00
Add medium size avatars for use on the user's own settings page. This adds a medium (500px) size avatar thumbnail, that can be referenced as `{name}-medium.png`. It is intended to be used on the user's own settings page, though we may come up with other use cases for high-resolution avatars in the future. This will automatically generate and upload the medium avatar images when a new avatar original is uploaded, and contains a migration (contributed by Kirill Kanakhin) to ensure all pre-existing avatar images have a medium avatar. Note that this implementation does not provide an endpoint for fetching the medium-size avatar for another user. [substantially modified by tabbott]
2016-09-20 21:48:48 +02:00
def get_avatar_url(avatar_source, email, medium=False):
mypy: Convert zerver/lib to use typing.Text.
2016-12-21 13:17:53 +01:00
# type: (Text, Text, bool) -> Text
Fix annotations related to make_safe_digest and hashes.
2016-06-12 14:22:20 +02:00
if avatar_source == u'U':
Extract get_avatar_url(). This function doesn't require the whole UserProfile object to create the avatar url, and we call it from Message.to_dict_uncached(). (imported from commit e814caab101c4fedd1ba66df041a3408014e4085)
2013-09-21 16:32:29 +02:00
hash_key = user_avatar_hash(email)
Add medium size avatars for use on the user's own settings page. This adds a medium (500px) size avatar thumbnail, that can be referenced as `{name}-medium.png`. It is intended to be used on the user's own settings page, though we may come up with other use cases for high-resolution avatars in the future. This will automatically generate and upload the medium avatar images when a new avatar original is uploaded, and contains a migration (contributed by Kirill Kanakhin) to ensure all pre-existing avatar images have a medium avatar. Note that this implementation does not provide an endpoint for fetching the medium-size avatar for another user. [substantially modified by tabbott]
2016-09-20 21:48:48 +02:00
return upload_backend.get_avatar_url(hash_key, medium=medium)
Allow enterprise deployments to disable the use of Gravatar. (imported from commit 49c14cc7629f2ffe6cedaab5d42ad5bf7f6569a4)
2013-11-15 22:25:02 +01:00
elif settings.ENABLE_GRAVATAR:
Add medium size avatars for use on the user's own settings page. This adds a medium (500px) size avatar thumbnail, that can be referenced as `{name}-medium.png`. It is intended to be used on the user's own settings page, though we may come up with other use cases for high-resolution avatars in the future. This will automatically generate and upload the medium avatar images when a new avatar original is uploaded, and contains a migration (contributed by Kirill Kanakhin) to ensure all pre-existing avatar images have a medium avatar. Note that this implementation does not provide an endpoint for fetching the medium-size avatar for another user. [substantially modified by tabbott]
2016-09-20 21:48:48 +02:00
gravitar_query_suffix = "&s=%s" % (MEDIUM_AVATAR_SIZE,) if medium else ""
Extract get_avatar_url(). This function doesn't require the whole UserProfile object to create the avatar url, and we call it from Message.to_dict_uncached(). (imported from commit e814caab101c4fedd1ba66df041a3408014e4085)
2013-09-21 16:32:29 +02:00
hash_key = gravatar_hash(email)
Add medium size avatars for use on the user's own settings page. This adds a medium (500px) size avatar thumbnail, that can be referenced as `{name}-medium.png`. It is intended to be used on the user's own settings page, though we may come up with other use cases for high-resolution avatars in the future. This will automatically generate and upload the medium avatar images when a new avatar original is uploaded, and contains a migration (contributed by Kirill Kanakhin) to ensure all pre-existing avatar images have a medium avatar. Note that this implementation does not provide an endpoint for fetching the medium-size avatar for another user. [substantially modified by tabbott]
2016-09-20 21:48:48 +02:00
return u"https://secure.gravatar.com/avatar/%s?d=identicon%s" % (hash_key, gravitar_query_suffix)
Allow enterprise deployments to disable the use of Gravatar. (imported from commit 49c14cc7629f2ffe6cedaab5d42ad5bf7f6569a4)
2013-11-15 22:25:02 +01:00
else:
Allow overriding the default avatar image (imported from commit 66d413682a822e0019f28033f19908bdd9fa0156)
2013-11-18 16:58:39 +01:00
return settings.DEFAULT_AVATAR_URI+'?x=x'