settings: Make DEFAULT_LOGO_URI/DEFAULT_AVATAR_URI use staticfiles.

This commit is contained in:
Alex Vandiver
2023-01-24 23:30:24 +00:00
committed by Alex Vandiver
parent 5d0d0ba4a9
commit e31767dda4
5 changed files with 53 additions and 8 deletions

View File

@@ -2,6 +2,7 @@ import urllib
from typing import Any, Dict, Optional
from django.conf import settings
from django.contrib.staticfiles.storage import staticfiles_storage
from zerver.lib.avatar_hash import (
gravatar_hash,
@@ -106,7 +107,10 @@ def _get_unversioned_gravatar_url(email: str, medium: bool) -> str:
gravitar_query_suffix = f"&s={MEDIUM_AVATAR_SIZE}" if medium else ""
hash_key = gravatar_hash(email)
return f"https://secure.gravatar.com/avatar/{hash_key}?d=identicon{gravitar_query_suffix}"
return settings.DEFAULT_AVATAR_URI
elif settings.DEFAULT_AVATAR_URI is not None:
return settings.DEFAULT_AVATAR_URI
else:
return staticfiles_storage.url("images/default-avatar.png")
def _get_unversioned_avatar_url(