Merge branch '406-error-fetch-library' into 'develop'

Fix 406 error when fetching library

See merge request funkwhale/funkwhale!962

api/config/settings/common.py

@@ -213,16 +213,19 @@ if PLUGINS:
 else:
     logger.info("Running with no plugins")
 
+ADDITIONAL_APPS = env.list("ADDITIONAL_APPS", default=[])
 INSTALLED_APPS = (
     DJANGO_APPS
     + THIRD_PARTY_APPS
     + LOCAL_APPS
     + tuple(["{}.apps.Plugin".format(p) for p in PLUGINS])
+    + tuple(ADDITIONAL_APPS)
 )
 
 # MIDDLEWARE CONFIGURATION
 # ------------------------------------------------------------------------------
-MIDDLEWARE = (
+ADDITIONAL_MIDDLEWARES_BEFORE = env.list("ADDITIONAL_MIDDLEWARES_BEFORE", default=[])
+MIDDLEWARE = tuple(ADDITIONAL_MIDDLEWARES_BEFORE) + (
     "django.middleware.security.SecurityMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "corsheaders.middleware.CorsMiddleware",

api/config/urls.py

@@ -40,3 +40,8 @@ if settings.DEBUG:
         urlpatterns = [
             path("api/__debug__/", include(debug_toolbar.urls))
         ] + urlpatterns
+
+    if "silk" in settings.INSTALLED_APPS:
+        urlpatterns = [
+            url(r"^api/silk/", include("silk.urls", namespace="silk"))
+        ] + urlpatterns

api/funkwhale_api/federation/views.py

@@ -164,7 +164,7 @@ class MusicLibraryViewSet(
     FederationMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet
 ):
     authentication_classes = [authentication.SignatureAuthentication]
-    # renderer_classes = renderers.get_ap_renderers()
+    renderer_classes = renderers.get_ap_renderers()
     serializer_class = serializers.LibrarySerializer
     queryset = music_models.Library.objects.all().select_related("actor")
     lookup_field = "uuid"

api/requirements/local.txt

@@ -15,3 +15,4 @@ profiling
 asynctest==0.12.2
 aioresponses==0.6.0
 https://github.com/dmclain/django-debug-toolbar-line-profiler/archive/master.zip
+django-silk