Evaluate static files lazily

misago/conf/context_processors.py

@@ -4,12 +4,12 @@ from django.utils.translation import get_language
 
 from . import settings
 
-BLANK_AVATAR_URL = static(settings.MISAGO_BLANK_AVATAR)
-
 
 def conf(request):
     return {
-        "BLANK_AVATAR_URL": request.settings.blank_avatar or BLANK_AVATAR_URL,
+        "BLANK_AVATAR_URL": (
+            request.settings.blank_avatar or static(settings.MISAGO_BLANK_AVATAR)
+        ),
         "DEBUG": settings.DEBUG,
         "LANGUAGE_CODE_SHORT": get_language()[:2],
         "LOGIN_REDIRECT_URL": settings.LOGIN_REDIRECT_URL,
@@ -48,7 +48,9 @@ def preload_settings_json(request):
 
     request.frontend_context.update(
         {
-            "BLANK_AVATAR_URL": request.settings.blank_avatar or BLANK_AVATAR_URL,
+            "BLANK_AVATAR_URL": (
+                request.settings.blank_avatar or static(settings.MISAGO_BLANK_AVATAR)
+            ),
             "CSRF_COOKIE_NAME": settings.CSRF_COOKIE_NAME,
             "ENABLE_DELETE_OWN_ACCOUNT": request.settings.allow_delete_own_account,
             "ENABLE_DOWNLOAD_OWN_DATA": request.settings.allow_data_downloads,

misago/threads/views/attachment.py

@@ -6,18 +6,21 @@ from django.shortcuts import get_object_or_404, redirect
 from ...conf import settings
 from ..models import Attachment, AttachmentType
 
-DEFAULT_403_URL = static(settings.MISAGO_ATTACHMENT_403_IMAGE)
-DEFAULT_404_URL = static(settings.MISAGO_ATTACHMENT_404_IMAGE)
-
 
 def attachment_server(request, pk, secret, thumbnail=False):
     try:
         url = serve_file(request, pk, secret, thumbnail)
         return redirect(url)
     except PermissionDenied:
-        return redirect(request.settings.attachment_403_image or DEFAULT_403_URL)
+        error_image = request.settings.attachment_403_image
+        if not error_image:
+            error_image = static(settings.MISAGO_ATTACHMENT_403_IMAGE)
+        return redirect(error_image)
     except Http404:
-        return redirect(request.settings.attachment_404_image or DEFAULT_404_URL)
+        error_image = request.settings.attachment_404_image
+        if not error_image:
+            error_image = static(settings.MISAGO_ATTACHMENT_404_IMAGE)
+        return redirect(error_image)
 
 
 def serve_file(request, pk, secret, thumbnail):

misago/users/api/mention.py

@@ -22,7 +22,9 @@ def mention_suggestions(request):
             try:
                 avatar = user.avatars[-1]["url"]
             except IndexError:
-                avatar = static(settings.MISAGO_BLANK_AVATAR)
+                avatar = request.settings.blank_avatar
+                if not avatar:
+                    avatar = static(settings.MISAGO_BLANK_AVATAR)
 
             suggestions.append({"username": user.username, "avatar": avatar})
 

misago/users/views/avatarserver.py

@@ -4,8 +4,6 @@ from django.templatetags.static import static
 
 from ...conf import settings
 
-BLANK_AVATAR_URL = static(settings.MISAGO_BLANK_AVATAR)
-
 User = get_user_model()
 
 
@@ -25,4 +23,6 @@ def user_avatar(request, pk, size):
 
 
 def blank_avatar(request):
-    return redirect(request.settings.blank_avatar or BLANK_AVATAR_URL)
+    return redirect(
+        request.settings.blank_avatar or static(settings.MISAGO_BLANK_AVATAR)
+    )