Merge pull request #263 from mouse-reeve/delete

Send Delete activity, not Tombstone on deletion

bookwyrm/activitypub/verbs.py

@@ -26,7 +26,6 @@ class Delete(Verb):
     ''' Create activity '''
     to: List
     cc: List
-    signature: Signature
     type: str = 'Delete'
 
 

bookwyrm/models/base_model.py

@@ -108,6 +108,20 @@ class ActivitypubMixin:
         ).serialize()
 
 
+    def to_delete_activity(self, user):
+        ''' notice of deletion '''
+        # this should be a tombstone
+        activity_object = self.to_activity()
+
+        return activitypub.Delete(
+            id=self.remote_id + '/activity',
+            actor=user.remote_id,
+            to=['%s/followers' % user.remote_id],
+            cc=['https://www.w3.org/ns/activitystreams#Public'],
+            object=activity_object,
+        ).serialize()
+
+
     def to_update_activity(self, user):
         ''' wrapper for Updates to an activity '''
         activity_id = '%s#update/%s' % (user.remote_id, uuid4())

bookwyrm/outgoing.py

@@ -204,7 +204,7 @@ def handle_imported_book(user, item, include_reviews, privacy):
 def handle_delete_status(user, status):
     ''' delete a status and broadcast deletion to other servers '''
     delete_status(status)
-    broadcast(user, status.to_activity())
+    broadcast(user, status.to_delete_activity(user))
 
 
 def handle_status(user, form):