Merge branch 'pre-release/1.3.0' into develop

api/config/settings/common.py

@@ -871,6 +871,7 @@ Example:
 
 - ``redis://127.0.0.1:6379/0``
 - ``redis+socket:///run/redis/redis.sock?virtual_host=0``
+
 """
 # END CELERY
 # Location of root django.contrib.admin URL, use {% url 'admin:index' %}

api/docker/server.sh

@@ -6,7 +6,7 @@ funkwhale-manage collectstatic --noinput
 funkwhale-manage migrate
 
 # shellcheck disable=SC2086
-gunicorn config.asgi:application \
+exec gunicorn config.asgi:application \
     --workers "${FUNKWHALE_WEB_WORKERS-1}" \
     --worker-class uvicorn.workers.UvicornWorker \
     --bind 0.0.0.0:5000 \

api/funkwhale_api/federation/jsonld.py

@@ -1,5 +1,6 @@
 import asyncio
 import functools
+import logging
 
 import aiohttp
 import pyld.documentloader.requests
@@ -10,6 +11,8 @@ from rest_framework.fields import empty
 
 from . import contexts
 
+logger = logging.getLogger(__name__)
+
 
 def cached_contexts(loader):
     functools.wraps(loader)
@@ -282,7 +285,8 @@ class JsonLdSerializer(serializers.Serializer):
             if dereferenced_ids:
                 try:
                     loop = asyncio.get_event_loop()
-                except RuntimeError:
+                except RuntimeError as exception:
+                    logger.debug(exception)
                     loop = asyncio.new_event_loop()
                 references = self.context.setdefault("references", {})
                 loop.run_until_complete(

api/funkwhale_api/federation/serializers.py

@@ -247,6 +247,7 @@ class ActorSerializer(jsonld.JsonLdSerializer):
         truncate_length=common_models.CONTENT_TEXT_MAX_LENGTH,
         required=False,
         allow_null=True,
+        allow_blank=True,
     )
     followers = serializers.URLField(max_length=500, required=False)
     following = serializers.URLField(max_length=500, required=False, allow_null=True)

api/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funkwhale-api"
-version = "1.2.9"
+version = "1.2.10"
 description = "Funkwhale API"
 
 authors = ["Funkwhale Collective"]