From 2fba922e037f43337fb9ab01802e13a5dff1262d Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Sun, 31 Jul 2022 15:00:06 +0200
Subject: [PATCH] Improve notifications page

---
 app/templates/notifications.html | 43 ++++++++++++--------------------
 app/templates/utils.html         |  2 +-
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/app/templates/notifications.html b/app/templates/notifications.html
index 412d77f..3eac45f 100644
--- a/app/templates/notifications.html
+++ b/app/templates/notifications.html
@@ -5,6 +5,13 @@
 <title>{{ local_actor.display_name }} - Notifications</title>
 {% endblock %}
 
+{% macro notif_actor_action(notif, text) %}
+    <div class="actor-action">
+        <a href="{{ url_for("admin_profile") }}?actor_id={{ notif.actor.ap_id }}">{{ notif.actor.display_name | clean_html(notif.actor) | safe }}</a> {{ text }}
+        <span title="{{ notif.created_at.isoformat() }}">{{ notif.created_at | timeago }}</span>
+    </div>
+{% endmacro %}
+
 {% block content %}
     <div class="box">
     <h2>Notifications</h2>
@@ -13,49 +20,31 @@
     {%- for notif in notifications %}
     <div>
             {%- if notif.notification_type.value == "new_follower" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> followed you
-                </div>
+                {{ notif_actor_action(notif, "followed you") }}
                 {{ utils.display_actor(notif.actor, actors_metadata) }}
             {% elif notif.notification_type.value == "unfollow" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> unfollowed you
-                </div>
+                {{ notif_actor_action(notif, "unfollowed you") }}
                 {{ utils.display_actor(notif.actor, actors_metadata) }}
             {%- elif notif.notification_type.value == "follow_request_accepted" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> accepted your follow request
-                </div>
+                {{ notif_actor_action(notif, "accepted your follow request") }}
                 {{ utils.display_actor(notif.actor, actors_metadata) }}
             {%- elif notif.notification_type.value == "follow_request_rejected" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> rejected your follow request
-                </div>
+                {{ notif_actor_action(notif, "rejected your follow request") }}
                 {{ utils.display_actor(notif.actor, actors_metadata) }}
             {% elif notif.notification_type.value == "like" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> liked a post
-                </div>
+                {{ notif_actor_action(notif, "liked a post") }}
                 {{ utils.display_object(notif.outbox_object) }}
            {% elif notif.notification_type.value == "undo_like" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> un-liked a post
-                </div>
+                {{ notif_actor_action(notif, "unliked a post") }}
                 {{ utils.display_object(notif.outbox_object) }}
             {% elif notif.notification_type.value == "announce" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> boosted a post
-                </div>
+                {{ notif_actor_action(notif, "shared a post") }}
                 {{ utils.display_object(notif.outbox_object) }}
            {% elif notif.notification_type.value == "undo_announce" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> un-boosted a post
-                </div>
+                {{ notif_actor_action(notif, "unshared a post") }}
                 {{ utils.display_object(notif.outbox_object) }}
             {% elif notif.notification_type.value == "mention" %}
-                <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
-                    <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> mentioned you
-                </div>
+                {{ notif_actor_action(notif, "mentioned you") }}
                 {{ utils.display_object(notif.inbox_object) }}
             {% elif notif.notification_type.value == "new_webmention" %}
                 <div class="actor-action" title="{{ notif.created_at.isoformat() }}">
diff --git a/app/templates/utils.html b/app/templates/utils.html
index 5ba2ba5..23951fd 100644
--- a/app/templates/utils.html
+++ b/app/templates/utils.html
@@ -192,7 +192,7 @@
 {% macro actor_action(inbox_object, text) %}
     <div class="actor-action">
         <a href="{{ url_for("admin_profile") }}?actor_id={{ inbox_object.actor.ap_id }}">{{ inbox_object.actor.display_name | clean_html(inbox_object.actor) | safe }}</a> {{ text }}
-        <span>{{ inbox_object.ap_published_at | timeago }}</span>
+        <span title="{{ inbox_object.ap_published_at.isoformat() }}">{{ inbox_object.ap_published_at | timeago }}</span>
     </div>
 
 {% endmacro %}