MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve timeouts if nodeinfo and service actor is not known (#1714)

This commit is contained in:
Petitminion 2022-06-30 17:11:30 +02:00 committed by Marcos Peña
parent 07e51bcfc4
commit 615a201537
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/federation/tasks.py
View File

@ -206,7 +206,7 @@ def update_domain_nodeinfo(domain):
domain.service_actor = ( domain.service_actor = (
utils.retrieve_ap_object( utils.retrieve_ap_object(
service_actor_id, service_actor_id,
actor=actors.get_service_actor(), actor=None,
queryset=models.Actor, queryset=models.Actor,
serializer_class=serializers.ActorSerializer, serializer_class=serializers.ActorSerializer,
) )

6
api/funkwhale_api/federation/utils.py
View File

@ -67,7 +67,11 @@ def slugify_username(username):
def retrieve_ap_object( def retrieve_ap_object(
fid, actor, serializer_class=None, queryset=None, apply_instance_policies=True fid,
actor,
serializer_class=None,
queryset=None,
apply_instance_policies=True,
): ):
# we have a duplicate check here because it's less expensive to do those checks # we have a duplicate check here because it's less expensive to do those checks
# twice than to trigger a HTTP request # twice than to trigger a HTTP request

1
changes/changelog.d/1714.bugfix Normal file
View File

@ -0,0 +1 @@
Resolve timeouts if nodeinfo and service actor is not known (#1714)