askiiart/microblog.pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve Announce dedup

Browse source
This commit is contained in:
Thomas Sileo 2022-08-26 19:09:40 +02:00
parent edf9e28ed1
commit 7d4b7f6756
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/boxes.py
View file

@ -1654,10 +1654,21 @@ async def _handle_announce_activity(
# We already know about this object, show the announce in the # We already know about this object, show the announce in the
# stream if it's not already there, from an followed actor # stream if it's not already there, from an followed actor
# and if we haven't seen it recently # and if we haven't seen it recently
skip_delta = timedelta(hours=1)
if ( if (
now() - as_utc(relates_to_inbox_object.ap_published_at) # type: ignore now() - as_utc(relates_to_inbox_object.ap_published_at) # type: ignore
) > timedelta(hours=1): ) > skip_delta or (
await db_session.scalar(
select(func.count(func.distinct(models.InboxObject.id))).where(
models.InboxObject.ap_type == "Announce",
models.InboxObject.ap_published_at > now() - skip_delta,
models.InboxObject.relates_to_inbox_object_id
== relates_to_inbox_object.id,
)
)
) > 0:
announce_activity.is_hidden_from_stream = not is_from_following announce_activity.is_hidden_from_stream = not is_from_following
else: else:
# Save it as an inbox object # Save it as an inbox object
if not announce_activity.activity_object_ap_id: if not announce_activity.activity_object_ap_id: