Get file object from preferences instead from signal for generating favicons...

Get file object from preferences instead from signal for generating favicons after preference change

CHANGELOG.rst

@@ -14,6 +14,7 @@ Fixed
 
 * Signup was forbidden even if it was enabled in settings
 * Phone numbers were not properly linked and suboptimally formatted on person page
+* Favicon upload failed with S3 storage.
 
 `2.6`_ - 2022-01-10
 -------------------

aleksis/core/apps.py

@@ -17,7 +17,7 @@ from .registries import (
     site_preferences_registry,
 )
 from .util.apps import AppConfig
-from .util.core_helpers import get_or_create_favicon, has_person
+from .util.core_helpers import get_or_create_favicon, get_site_preferences, has_person
 from .util.sass_helpers import clean_scss
 
 
@@ -103,11 +103,15 @@ class CoreConfig(AppConfig):
                 is_favicon = name == "favicon"
 
                 if new_value:
-                    favicon_id = Favicon.on_site.update_or_create(
+                    # Get file object from preferences instead of using new_value
+                    # to prevent problems with special file storages
+                    file_obj = get_site_preferences()[f"{section}__{name}"]
+
+                    favicon = Favicon.on_site.update_or_create(
                         title=name,
-                        defaults={"isFavicon": is_favicon, "faviconImage": new_value},
+                        defaults={"isFavicon": is_favicon, "faviconImage": file_obj},
                     )[0]
-                    FaviconImg.objects.filter(faviconFK=favicon_id).delete()
+                    FaviconImg.objects.filter(faviconFK=favicon).delete()
                 else:
                     Favicon.on_site.filter(title=name, isFavicon=is_favicon).delete()
                     if name in settings.DEFAULT_FAVICON_PATHS: