mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 14:03:30 +00:00
3f58e20993
In this commit we change user_avatar_hash with user_avatar_path which now returns paths to avatars based on the email hash. Tweaked by tabbott to avoid an import loop.
42 lines
1.4 KiB
Python
42 lines
1.4 KiB
Python
from __future__ import absolute_import
|
|
from django.conf import settings
|
|
|
|
if False:
|
|
from zerver.models import UserProfile
|
|
|
|
from typing import Text
|
|
|
|
from zerver.lib.avatar_hash import gravatar_hash, user_avatar_path
|
|
from zerver.lib.upload import upload_backend, MEDIUM_AVATAR_SIZE
|
|
from zerver.models import get_user_profile_by_email
|
|
|
|
def avatar_url(user_profile, medium=False):
|
|
# type: (UserProfile, bool) -> Text
|
|
return get_avatar_url(
|
|
user_profile.avatar_source,
|
|
user_profile.email,
|
|
user_profile.avatar_version,
|
|
medium=medium)
|
|
|
|
def get_avatar_url(avatar_source, email, avatar_version, medium=False):
|
|
# type: (Text, Text, int, bool) -> Text
|
|
url = _get_unversioned_avatar_url(
|
|
avatar_source,
|
|
email,
|
|
medium)
|
|
url += '&version=%d' % (avatar_version,)
|
|
return url
|
|
|
|
def _get_unversioned_avatar_url(avatar_source, email, medium=False):
|
|
# type: (Text, Text, bool) -> Text
|
|
if avatar_source == u'U':
|
|
user_profile = get_user_profile_by_email(email)
|
|
hash_key = user_avatar_path(user_profile)
|
|
return upload_backend.get_avatar_url(hash_key, medium=medium)
|
|
elif settings.ENABLE_GRAVATAR:
|
|
gravitar_query_suffix = "&s=%s" % (MEDIUM_AVATAR_SIZE,) if medium else ""
|
|
hash_key = gravatar_hash(email)
|
|
return u"https://secure.gravatar.com/avatar/%s?d=identicon%s" % (hash_key, gravitar_query_suffix)
|
|
else:
|
|
return settings.DEFAULT_AVATAR_URI+'?x=x'
|