Avoid caching default avatar images

Signed-off-by: Michal Čihař <michal@cihar.com>

weblate/accounts/avatar.py

@@ -85,6 +85,16 @@ def avatar_for_email(email, size=80):
     return url
 
 
+def get_fallback_avatar_url(size):
+    """
+    Returns URL of fallback avatar.
+    """
+    return os.path.join(
+        settings.MEDIA_URL,
+        'weblate-{0}.png'.format(size)
+    )
+
+
 def get_fallback_avatar(size):
     """
     Returns fallback avatar.
@@ -167,10 +177,7 @@ def get_user_display(user, icon=True, link=False):
     # Icon requested?
     if icon and appsettings.ENABLE_AVATARS:
         if user is None or user.email == 'noreply@weblate.org':
-            avatar = os.path.join(
-                settings.MEDIA_URL,
-                'weblate-32.png'
-            )
+            avatar = get_fallback_avatar_url(32)
         else:
             avatar = reverse(
                 'user_avatar', kwargs={'user': user.username, 'size': 32}

weblate/accounts/views.py

@@ -42,7 +42,7 @@ from social.apps.django_app.utils import BACKENDS
 from social.apps.django_app.views import complete
 
 import weblate
-from weblate.accounts.avatar import get_avatar_image
+from weblate.accounts.avatar import get_avatar_image, get_fallback_avatar_url
 from weblate.accounts.models import set_lang, remove_user, Profile
 from weblate.trans.models import Change, Project
 from weblate.accounts.forms import (
@@ -346,6 +346,9 @@ def user_avatar(request, user, size):
     '''
     user = get_object_or_404(User, username=user)
 
+    if user.email == 'noreply@weblate.org':
+        return redirect(get_fallback_avatar_url(size))
+
     return HttpResponse(
         content_type='image/png',
         content=get_avatar_image(user, size)