From c08f3fbefb3a8cac1569287e77cbcf82b0e57d2f Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Fri, 19 Aug 2022 09:11:22 +0200 Subject: [PATCH] Fix old inbox data pruning --- app/prune.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/prune.py b/app/prune.py index 8cb5814..7d1d65b 100644 --- a/app/prune.py +++ b/app/prune.py @@ -55,14 +55,16 @@ async def _prune_old_inbox_objects( models.InboxObject.liked_via_outbox_object_ap_id.is_(None), # Keep announced objects models.InboxObject.announced_via_outbox_object_ap_id.is_(None), - # Keep objects related to local conversations + # Keep objects related to local conversations (i.e. don't break the + # public website) or_( models.InboxObject.conversation.not_like(f"{BASE_URL}%"), models.InboxObject.conversation.is_(None), ), # Keep activities related to the outbox (like Like/Announce/Follow...) or_( - models.InboxObject.activity_object_ap_id.not_like(f"{BASE_URL}*"), + # XXX: no `/` here because the local ID does not have one + models.InboxObject.activity_object_ap_id.not_like(f"{BASE_URL}%"), models.InboxObject.activity_object_ap_id.is_(None), ), # Keep direct messages