From b393df8cab781fcd35f8e5710af5c65bc41f5bc0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 09:35:00 -0800
Subject: [PATCH] Fixes deletion

---
 bookwyrm/activitypub/note.py       | 6 ++++++
 bookwyrm/models/status.py          | 6 ++++++
 bookwyrm/tests/views/test_inbox.py | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 5da2cced6..705d6eede 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -1,6 +1,7 @@
 ''' note serializer and children thereof '''
 from dataclasses import dataclass, field
 from typing import Dict, List
+from django.apps import apps
 
 from .base_activity import ActivityObject, Link
 from .image import Image
@@ -10,6 +11,11 @@ class Tombstone(ActivityObject):
     ''' the placeholder for a deleted status '''
     type: str = 'Tombstone'
 
+    def to_model(self, *args, **kwargs):
+        ''' this should never really get serialized, just searched for '''
+        model = apps.get_model('bookwyrm.Status')
+        return model.find_existing_by_remote_id(self.id)
+
 
 @dataclass(init=False)
 class Note(ActivityObject):
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 716c15927..029ca5a40 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -84,6 +84,12 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
                 related_status=self,
             )
 
+    def delete(self, *args, **kwargs):
+        ''' "delete" a status '''
+        self.deleted = True
+        self.deleted_date = timezone.now()
+        self.save()
+
     @property
     def recipients(self):
         ''' tagged users who definitely need to get this status in broadcast '''
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index af513609a..cfd0e8c07 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -422,6 +422,8 @@ class Inbox(TestCase):
         self.assertFalse(self.status.deleted)
         activity = {
             'type': 'Delete',
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
             'id': '%s/activity' % self.status.remote_id,
             'actor': self.remote_user.remote_id,
             'object': {'id': self.status.remote_id, 'type': 'Tombstone'},
@@ -451,6 +453,8 @@ class Inbox(TestCase):
         self.assertEqual(models.Notification.objects.count(), 2)
         activity = {
             'type': 'Delete',
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
             'id': '%s/activity' % self.status.remote_id,
             'actor': self.remote_user.remote_id,
             'object': {'id': self.status.remote_id, 'type': 'Tombstone'},