Cleanup reply delete

core/activitypub.py

@@ -410,20 +410,6 @@ class MicroblogPubBackend(Backend):
 
         return data
 
-    def set_post_to_remote_inbox(self, cb):
-        self.post_to_remote_inbox_cb = cb
-
-    def _handle_replies_delete(
-        self, as_actor: ap.Person, in_reply_to: Optional[str]
-    ) -> None:
-        if not in_reply_to:
-            pass
-
-        DB.activities.update_one(
-            {"activity.object.id": in_reply_to},
-            {"$inc": {"meta.count_reply": -1, "meta.count_direct_reply": -1}},
-        )
-
 
 def embed_collection(total_items, first_page_id):
     """Helper creating a root OrderedCollection with a link to the first page."""

core/inbox.py

@@ -20,8 +20,6 @@ from core.meta import by_type
 from core.meta import in_inbox
 from core.meta import inc
 from core.meta import upsert
-from core.shared import MY_PERSON
-from core.shared import back
 from core.tasks import Tasks
 from utils import now
 
@@ -47,13 +45,14 @@ def _delete_process_inbox(delete: ap.Delete, new_meta: _NewMeta) -> None:
         _logger.info(f"inbox_delete handle_replies obj={obj!r}")
         in_reply_to = obj.get_in_reply_to() if obj.inReplyTo else None
         if obj.has_type(ap.CREATE_TYPES):
+            post_query = {**by_object_id(obj_id), **by_type(ap.ActivityType.CREATE)}
             in_reply_to = ap._get_id(
-                DB.activities.find_one(
-                    {"meta.object_id": obj_id, "type": ap.ActivityType.CREATE.value}
-                )["activity"]["object"].get("inReplyTo")
+                DB.activities.find_one(post_query)["activity"]["object"].get(
+                    "inReplyTo"
+                )
             )
             if in_reply_to:
-                back._handle_replies_delete(MY_PERSON, in_reply_to)
+                DB.activities.update_one(post_query, inc(MetaKey.COUNT_REPLY, -1))
     except Exception:
         _logger.exception(f"failed to handle delete replies for {obj_id}")