Broadcast user deletions

bookwyrm/models/activitypub_mixin.py

@@ -241,7 +241,7 @@ class ObjectMixin(ActivitypubMixin):
             return
 
         # is this a deletion?
-        if hasattr(self, "deleted") and self.deleted:
+        if (hasattr(self, "deleted") and self.deleted) or hasattr(self, "is_active") and not self.is_active:
             activity = self.to_delete_activity(user)
         else:
             activity = self.to_update_activity(user)

bookwyrm/models/user.py

@@ -283,6 +283,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
                 editable=False,
             ).save(broadcast=False)
 
+    def delete(self, *args, **kwargs):
+        """ deactivate rather than delete a user """
+        self.is_active = False
+        # skip the logic in this class's save()
+        super().save(*args, **kwargs)
+
     @property
     def local_path(self):
         """ this model doesn't inherit bookwyrm model, so here we are """

bookwyrm/tests/views/inbox/test_inbox_delete.py

@@ -116,7 +116,7 @@ class InboxActivities(TestCase):
             'type': 'Delete',
             'actor': 'https://example.com/users/test-user',
             'to': ['https://www.w3.org/ns/activitystreams#Public'],
-            'object': 'https://example.com/users/test-user',
+            'object': self.remote_user.remote_id,
         }
 
         views.inbox.activity_task(activity)