forks/microblog.pub
1
0
Fork 1
mirror of https://git.sr.ht/~tsileo/microblog.pub synced 2024-12-31 01:24:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for pruned Move objects

Browse source
This commit is contained in:
Thomas Sileo 2023-07-03 20:25:03 +02:00
parent 3c07494809
commit 2cec800332
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/prune.py
View file

@ -102,6 +102,8 @@ async def _prune_old_inbox_objects(
models.InboxObject.ap_type.in_(["Note"]), models.InboxObject.ap_type.in_(["Note"]),
) )
), ),
# Keep Move object as they are linked to notifications
models.InboxObject.ap_type.not_in(["Move"]),
# Filter by retention days # Filter by retention days
models.InboxObject.ap_published_at models.InboxObject.ap_published_at
< now() - timedelta(days=INBOX_RETENTION_DAYS), < now() - timedelta(days=INBOX_RETENTION_DAYS),

2
app/templates/notifications.html
View file

@ -51,7 +51,7 @@
{% elif notif.notification_type.value == "unblock" %} {% elif notif.notification_type.value == "unblock" %}
{{ notif_actor_action(notif, "was unblocked") }} {{ notif_actor_action(notif, "was unblocked") }}
{{ utils.display_actor(notif.actor, actors_metadata) }} {{ utils.display_actor(notif.actor, actors_metadata) }}
{%- elif notif.notification_type.value == "move" %} {%- elif notif.notification_type.value == "move" and notif.inbox_object %}
{# for move notif, the actor is the target and the inbox object the Move activity #} {# for move notif, the actor is the target and the inbox object the Move activity #}
<div class="actor-action"> <div class="actor-action">
<a href="{{ url_for("admin_profile") }}?actor_id={{ notif.inbox_object.actor.ap_id }}"> <a href="{{ url_for("admin_profile") }}?actor_id={{ notif.inbox_object.actor.ap_id }}">