From 4046fa050636d09e7e964075b16e82a6db8e9265 Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Fri, 22 Jul 2022 19:36:58 +0200
Subject: [PATCH] Add notification for follow requests status

---
 app/boxes.py                     | 12 ++++++++++++
 app/main.py                      |  1 -
 app/models.py                    |  7 +++++++
 app/templates/layout.html        |  2 +-
 app/templates/notifications.html | 10 ++++++++++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/boxes.py b/app/boxes.py
index 167279c..7b25641 100644
--- a/app/boxes.py
+++ b/app/boxes.py
@@ -1105,6 +1105,18 @@ async def save_to_inbox(
                     ap_actor_id=actor.ap_id,
                 )
                 db_session.add(following)
+
+                notif_type = (
+                    models.NotificationType.FOLLOW_REQUEST_ACCEPTED
+                    if activity_ro.ap_type == "Accept"
+                    else models.NotificationType.FOLLOW_REQUEST_REJECTED
+                )
+                notif = models.Notification(
+                    notification_type=notif_type,
+                    actor_id=actor.id,
+                    inbox_object_id=inbox_object.id,
+                )
+                db_session.add(notif)
             else:
                 logger.info(
                     "Received an Accept for an unsupported activity: "
diff --git a/app/main.py b/app/main.py
index ac2443f..a2d7dc1 100644
--- a/app/main.py
+++ b/app/main.py
@@ -78,7 +78,6 @@ _RESIZED_CACHE: MutableMapping[tuple[str, int], tuple[bytes, str, Any]] = LFUCac
 # Next:
 # - show pending follow request (and prevent double follow?)
 # - UI support for updating posts
-# - Support for processing update
 # - Article support
 # - Fix tests
 # - Fix SQL tx in the codebase
diff --git a/app/models.py b/app/models.py
index 5bda03f..631857e 100644
--- a/app/models.py
+++ b/app/models.py
@@ -479,11 +479,18 @@ class Webmention(Base):
 class NotificationType(str, enum.Enum):
     NEW_FOLLOWER = "new_follower"
     UNFOLLOW = "unfollow"
+
+    FOLLOW_REQUEST_ACCEPTED = "follow_request_accepted"
+    FOLLOW_REQUEST_REJECTED = "follow_request_rejected"
+
     LIKE = "like"
     UNDO_LIKE = "undo_like"
+
     ANNOUNCE = "announce"
     UNDO_ANNOUNCE = "undo_announce"
+
     MENTION = "mention"
+
     NEW_WEBMENTION = "new_webmention"
     UPDATED_WEBMENTION = "updated_webmention"
     DELETED_WEBMENTION = "deleted_webmention"
diff --git a/app/templates/layout.html b/app/templates/layout.html
index de6265f..e10dc0e 100644
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -30,7 +30,7 @@
         <li>{{ admin_link("index", "Public") }}</li>
         <li>{{ admin_link("admin_new", "New") }}</li>
         <li>{{ admin_link("admin_stream", "Stream") }}</li>
-        <li>{{ admin_link("admin_inbox", "Inbox") }}/{{ admin_link("admin_outbox", "Outbox") }}</li>
+        <li>{{ admin_link("admin_inbox", "Inbox") }} / {{ admin_link("admin_outbox", "Outbox") }}</li>
         <li>{{ admin_link("get_notifications", "Notifications") }} {% if notifications_count %}({{ notifications_count }}){% endif %}</li>
         <li>{{ admin_link("get_lookup", "Lookup") }}</li>
         <li>{{ admin_link("admin_bookmarks", "Bookmarks") }}</li>
diff --git a/app/templates/notifications.html b/app/templates/notifications.html
index 6585e48..412d77f 100644
--- a/app/templates/notifications.html
+++ b/app/templates/notifications.html
@@ -22,6 +22,16 @@
                     <a style="font-weight:bold;" href="{{ notif.actor.url }}">{{ notif.actor.display_name }}</a> unfollowed you
                 </div>
                 {{ 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>
+                {{ 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>
+                {{ 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