refactor post delete

Author: alphatownsman

activities/models/fan_out.py

@@ -105,13 +105,8 @@ def handle_new(cls, instance: "FanOut"):
 
             # Handle deleting local posts
             case (FanOut.Types.post_deleted, True):
-                post = instance.subject_post
-                if instance.identity.local:
-                    # Remove all timeline events mentioning it
-                    TimelineEvent.objects.filter(
-                        identity=instance.identity,
-                        subject_post=post,
-                    ).delete()
+                # already done in Post.handle_deleted
+                pass
 
             # Handle sending remote post deletes
             case (FanOut.Types.post_deleted, False):

activities/models/post.py

@@ -147,9 +147,25 @@ def handle_fanned_out(cls, instance: "Post"):
     @classmethod
     def handle_deleted(cls, instance: "Post"):
         """
-        Creates all needed fan-out objects needed to delete a Post.
+        When a post is deleted:
+        - Undo all interactions (so that remote follower of the booster will unsee it from their timeline)
+        - Remove all timeline events
+        - Remove all bookmarks
+        - Fan out the deletion, fanout of remote post deletion is not supported yet
         """
-        cls.targets_fan_out(instance, FanOut.Types.post_deleted)
+        from users.models import Bookmark
+        from .post_interaction import PostInteraction, PostInteractionStates
+        from .timeline_event import TimelineEvent
+
+        TimelineEvent.objects.filter(subject_post=instance).delete()
+        Bookmark.objects.filter(post=instance).delete()
+        PostInteraction.transition_perform_queryset(
+            PostInteraction.objects.filter(
+                post=instance,
+                state__in=PostInteractionStates.group_active(),
+            ),
+            PostInteractionStates.undone,
+        )
         return cls.deleted_fanned_out
 
     @classmethod
@@ -1182,7 +1198,7 @@ def handle_delete_ap(cls, data):
             # Ensure the actor on the request authored the post
             if not post.author.actor_uri == data["actor"]:
                 raise ValueError("Actor on delete does not match object")
-            post.delete()
+            post.transition_perform(PostStates.deleted)
 
     @classmethod
     def handle_fetch_internal(cls, data):

activities/services/post.py

@@ -149,17 +149,15 @@ def context(
 
     def delete(self):
         """
-        Marks a post as deleted and immediately cleans up its timeline events etc.
+        Marks a post as deleted and cleans up authors timeline events,
+        remaining cleanups will be done in stator.
         """
         self.post.transition_perform(PostStates.deleted)
-        TimelineEvent.objects.filter(subject_post=self.post).delete()
-        PostInteraction.transition_perform_queryset(
-            PostInteraction.objects.filter(
-                post=self.post,
-                state__in=PostInteractionStates.group_active(),
-            ),
-            PostInteractionStates.undone,
-        )
+        TimelineEvent.objects.filter(
+            identity=self.post.author,
+            type__in=[TimelineEvent.Types.post, TimelineEvent.Types.boost],
+            subject_post=self.post,
+        ).delete()
 
     def pin_as(self, identity: Identity):
         if identity != self.post.author:

tests/activities/models/test_post.py

@@ -461,7 +461,9 @@ def test_inbound_posts(
 
     # Run stator and ensure that deleted the post
     stator.run_single_cycle()
-    assert not Post.objects.filter(object_uri="https://remote.test/test-post").exists()
+    stator.run_single_cycle()
+    post = Post.objects.get(object_uri="https://remote.test/test-post")
+    assert post.state == str(PostStates.deleted_fanned_out)
 
     # Create an inbound new post message with only contentMap
     message = {