Merge branch 'stable' into develop

2022-07-04 17:18:55 +02:00 · 2022-07-04 17:18:55 +02:00 · 5c5b35a0ad
commit 5c5b35a0ad
parent fd8d157eb8 366fb5f30f
12 changed files with 1178 additions and 1063 deletions
--- a/api/funkwhale_api/federation/tasks.py
+++ b/api/funkwhale_api/federation/tasks.py
@ -208,7 +208,7 @@ def update_domain_nodeinfo(domain):
        domain.service_actor = (
            utils.retrieve_ap_object(
                service_actor_id,
-                actor=actors.get_service_actor(),
+                actor=None,
                queryset=models.Actor,
                serializer_class=serializers.ActorSerializer,
            )