Make activitypub_object_view into a view decorator

federation/entities/activitypub/django/views.py

@@ -1,21 +1,28 @@
-from typing import Callable
+from functools import wraps
 
-from django.http import HttpRequest, Http404, JsonResponse
+from django.http import Http404, JsonResponse
+
+from federation.utils.django import get_function_from_config
 
 
-def activitypub_object_view(request: HttpRequest, fetch_function: Callable, fallback_view=None):
-    # TODO implement as view decorator instead?
+def activitypub_object_view(request, *args, **kwargs):
     """
-    Generic ActivityPub object view.
+    Generic ActivityPub object view decorator.
 
     Takes an ID and fetches it using the provided function. Renders the ActivityPub object
-    in JSON if the object is found. Falls back to fallback view, if given, if the content
+    in JSON if the object is found. Falls back to decorated view, if the content
     type doesn't match.
     """
-    if request.content_type != 'application/json':
-        return fallback_view.as_view(request=request)
-    obj = fetch_function(request.build_absolute_uri())
-    if not obj:
-        raise Http404
+    def decorator(func):
+        @wraps(func)
+        def inner(request, *args, **kwargs):
+            if request.content_type != 'application/json':
+                return func(request, *args, **kwargs)
+            get_object_function = get_function_from_config('get_object_function')
+            obj = get_object_function(request.build_absolute_uri())
+            if not obj:
+                raise Http404
 
-    return JsonResponse(obj.to_as2())
+            return JsonResponse(obj.to_as2())
+        return inner
+    return decorator

federation/tests/entities/activitypub/django/test_views.py

@@ -1,12 +1,17 @@
 import json
-from unittest.mock import Mock
 
+from django.http import HttpResponse
 from django.test import RequestFactory
 
 from federation.entities.activitypub.django.views import activitypub_object_view
 from federation.entities.activitypub.entities import ActivitypubProfile
 
 
+@activitypub_object_view
+def dummy_view(request, *args, **kwargs):
+    return HttpResponse("foo")
+
+
 class TestActivityPubObjectView:
     def test_renders_as2(self):
         entity = ActivitypubProfile(
@@ -18,11 +23,8 @@ class TestActivityPubObjectView:
         )
         # TODO test with real content type, but also json
         request = RequestFactory().get("/", CONTENT_TYPE='application/json')
-        response = activitypub_object_view(
-            request=request,
-            fetch_function=lambda x: entity,
-            fallback_view=lambda x: Mock,
-        )
+        response = dummy_view(request)(request=request)
+
         assert response.status_code == 200
         content = json.loads(response.content)
         assert content['name'] == 'Bob Bobértson'

federation/tests/entities/diaspora/test_utils.py

@@ -16,14 +16,14 @@ class TestGetBaseAttributes:
         attrs = get_base_attributes(entity).keys()
         assert set(attrs) == {
             "created_at", "location", "provider_display_name", "public", "raw_content",
-            "signature", "base_url", "actor_id", "id", "handle", "guid",
+            "signature", "base_url", "actor_id", "id", "handle", "guid", "activity", "activity_id",
         }
         entity = Profile()
         attrs = get_base_attributes(entity).keys()
         assert set(attrs) == {
             "created_at", "name", "email", "gender", "raw_content", "location", "public",
             "nsfw", "public_key", "image_urls", "tag_list", "signature", "url", "atom_url",
-            "base_url", "id", "actor_id", "handle", "handle", "guid",
+            "base_url", "id", "actor_id", "handle", "handle", "guid", "activity", "activity_id",
         }
 
 class TestGetFullXMLRepresentation: