Another fix to content types accepted by activitypub_object_view

federation/entities/activitypub/django/views.py

@@ -12,11 +12,17 @@ def activitypub_object_view(func):
     type doesn't match.
     """
     def inner(request, *args, **kwargs):
-        if request.META.get('HTTP_ACCEPT') not in (
+        fallback = True
-                'application/json', 'application/activity+json', 'application/ld+json',
+        accept = request.META.get('HTTP_ACCEPT', '')
-                'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+        for content_type in (
+            'application/json', 'application/activity+json', 'application/ld+json',
         ):
+            if accept.find(content_type) > -1:
+                fallback = False
+                break
+        if fallback:
             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:

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

@@ -24,6 +24,7 @@ class TestActivityPubObjectView:
     @pytest.mark.parametrize('content_type', (
             'application/json', 'application/activity+json', 'application/ld+json',
             'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+            'application/activity+json, application/ld+json',
     ))
     def test_renders_as2(self, content_type):
         request = RequestFactory().get("/", HTTP_ACCEPT=content_type)
@@ -37,6 +38,7 @@ class TestActivityPubObjectView:
     @pytest.mark.parametrize('content_type', (
             'application/json', 'application/activity+json', 'application/ld+json',
             'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+            'application/activity+json, application/ld+json',
     ))
     def test_renders_as2__cbv(self, content_type):
         request = RequestFactory().get("/", HTTP_ACCEPT=content_type)