Fixes unfollow

bookwyrm/activitypub/base_activity.py

@@ -85,11 +85,14 @@ class ActivityObject:
         # figure out the right model -- wish I had a better way for this
         model = model or get_model_from_type(self.type)
 
-        if hasattr(model, 'ignore_activity') and model.ignore_activity(self):
-            return instance
+        # only reject statuses if we're potentially creating them
+        if allow_create and \
+                hasattr(model, 'ignore_activity') and model.ignore_activity(self):
+            return None
 
         # check for an existing instance
         instance = instance or model.find_existing(self.serialize())
+
         if not instance and not allow_create:
             # so that we don't create when we want to delete or update
             return None

bookwyrm/activitypub/verbs.py

@@ -1,6 +1,7 @@
 ''' undo wrapper activity '''
 from dataclasses import dataclass
 from typing import List
+from django.apps import apps
 
 from .base_activity import ActivityObject, Signature, resolve_remote_id
 from .book import Edition
@@ -59,7 +60,12 @@ class Undo(Verb):
 
     def action(self):
         ''' find and remove the activity object '''
-        obj = self.object.to_model(save=False, allow_create=False)
+        # this is so hacky but it does make it work....
+        # (because you Reject a request and Undo a follow
+        model = None
+        if self.object.type == 'Follow':
+            model = apps.get_model('bookwyrm.UserFollows')
+        obj = self.object.to_model(model=model, save=False, allow_create=False)
         obj.delete()