See #170: subscribe to 3d-party RSS feeds in Funkwhale

api/funkwhale_api/federation/actors.py

@@ -42,21 +42,32 @@ def get_actor(fid, skip_cache=False):
     return serializer.save(last_fetch_date=timezone.now())
 
 
-def get_service_actor():
+_CACHE = {}
+
+
+def get_service_actor(cache=True):
+    if cache and "service_actor" in _CACHE:
+        return _CACHE["service_actor"]
+
     name, domain = (
         settings.FEDERATION_SERVICE_ACTOR_USERNAME,
         settings.FEDERATION_HOSTNAME,
     )
     try:
-        return models.Actor.objects.select_related().get(
+        actor = models.Actor.objects.select_related().get(
             preferred_username=name, domain__name=domain
         )
     except models.Actor.DoesNotExist:
         pass
+    else:
+        _CACHE["service_actor"] = actor
+        return actor
 
     args = users_models.get_actor_data(name)
     private, public = keys.get_key_pair()
     args["private_key"] = private.decode("utf-8")
     args["public_key"] = public.decode("utf-8")
     args["type"] = "Service"
-    return models.Actor.objects.create(**args)
+    actor = models.Actor.objects.create(**args)
+    _CACHE["service_actor"] = actor
+    return actor

api/funkwhale_api/federation/tasks.py

@@ -311,6 +311,7 @@ def fetch(fetch_obj):
         auth = signing.get_auth(actor.private_key, actor.private_key_id)
     else:
         auth = None
+    auth = None
     try:
         if url.startswith("webfinger://"):
             # we first grab the correpsonding webfinger representation

api/funkwhale_api/federation/views.py

@@ -13,7 +13,16 @@ from funkwhale_api.moderation import models as moderation_models
 from funkwhale_api.music import models as music_models
 from funkwhale_api.music import utils as music_utils
 
-from . import activity, authentication, models, renderers, serializers, utils, webfinger
+from . import (
+    actors,
+    activity,
+    authentication,
+    models,
+    renderers,
+    serializers,
+    utils,
+    webfinger,
+)
 
 
 def redirect_to_html(public_url):
@@ -61,6 +70,10 @@ class ActorViewSet(FederationMixin, mixins.RetrieveModelMixin, viewsets.GenericV
     queryset = models.Actor.objects.local().select_related("user")
     serializer_class = serializers.ActorSerializer
 
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        return queryset.exclude(channel__attributed_to=actors.get_service_actor())
+
     def retrieve(self, request, *args, **kwargs):
         instance = self.get_object()
         if utils.should_redirect_ap_to_html(request.headers.get("accept")):