Merge pull request #2114 from bookwyrm-social/sentry-error-article

Fixes exception when receiving Article type activities

bookwyrm/activitypub/base_activity.py

@@ -39,12 +39,12 @@ def naive_parse(activity_objects, activity_json, serializer=None):
             activity_json["type"] = "PublicKey"
 
         activity_type = activity_json.get("type")
+        if activity_type in ["Question", "Article"]:
+            return None
         try:
             serializer = activity_objects[activity_type]
         except KeyError as err:
             # we know this exists and that we can't handle it
-            if activity_type in ["Question"]:
-                return None
             raise ActivitySerializerError(err)
 
     return serializer(activity_objects=activity_objects, **activity_json)

bookwyrm/tests/views/inbox/test_inbox_create.py

@@ -208,14 +208,42 @@ class InboxCreate(TestCase):
         self.assertEqual(book_list.description, "summary text")
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
-    def test_create_unsupported_type(self, *_):
+    def test_create_unsupported_type_question(self, *_):
         """ignore activities we know we can't handle"""
         activity = self.create_json
         activity["object"] = {
             "id": "https://example.com/status/887",
             "type": "Question",
         }
-        # just observer how it doesn't throw an error
+        # just observe how it doesn't throw an error
+        views.inbox.activity_task(activity)
+
+    def test_create_unsupported_type_article(self, *_):
+        """special case in unsupported type because we do know what it is"""
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/status/887",
+            "type": "Article",
+            "name": "hello",
+            "published": "2021-04-29T21:27:30.014235+00:00",
+            "attributedTo": "https://example.com/user/mouse",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "sensitive": False,
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        # just observe how it doesn't throw an error
+        views.inbox.activity_task(activity)
+
+    def test_create_unsupported_type_unknown(self, *_):
+        """Something truly unexpected should throw an error"""
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/status/887",
+            "type": "Blaaaah",
+        }
+        # error this time
+        with self.assertRaises(ActivitySerializerError):
             views.inbox.activity_task(activity)
 
     def test_create_unknown_type(self, *_):