jonny/microblog.pub
1
0
Fork 0
forked from forks/microblog.pub
Code Pull requests Activity

Tweak query for pruning inbox data

Browse source
This commit is contained in:
Thomas Sileo 2022-08-19 00:03:49 +02:00
parent 0ffacca796
commit 89e21b88e3
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/prune.py
View file

@ -4,6 +4,7 @@ from loguru import logger
from sqlalchemy import and_ from sqlalchemy import and_
from sqlalchemy import delete from sqlalchemy import delete
from sqlalchemy import not_ from sqlalchemy import not_
from sqlalchemy import or_
from app import activitypub as ap from app import activitypub as ap
from app import models from app import models
@ -55,7 +56,15 @@ async def _prune_old_inbox_objects(
# Keep announced objects # Keep announced objects
models.InboxObject.announced_via_outbox_object_ap_id.is_(None), models.InboxObject.announced_via_outbox_object_ap_id.is_(None),
# Keep objects related to local conversations # Keep objects related to local conversations
models.InboxObject.conversation.not_like(f"{BASE_URL}/%"), 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}/*"),
models.InboxObject.activity_object_ap_id.is_(None),
),
# Keep direct messages # Keep direct messages
not_( not_(
and_( and_(