From 7cb1f8196eb99d65a864db2743a4bcbb0083f4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= <zaklaus@outlook.com>
Date: Thu, 12 Jan 2023 14:49:37 +0000
Subject: [PATCH] improve DMs + add rebuild script

---
 app/admin.py                             | 4 +++-
 app/templates/admin_direct_messages.html | 4 +++-
 rebuild.sh                               | 7 +++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100755 rebuild.sh

diff --git a/app/admin.py b/app/admin.py
index 226b193..0c40ff2 100644
--- a/app/admin.py
+++ b/app/admin.py
@@ -587,9 +587,11 @@ async def admin_direct_messages(
                 )
             ).scalars()
         )
+        has_actors = True
         # If this message from outbox starts a thread with no replies, look
         # at the mentions
         if not actors and anybox_object.is_from_outbox:
+            has_actors = False
             actors = (  # type: ignore
                 await db_session.execute(
                     select(models.Actor).where(
@@ -601,7 +603,7 @@ async def admin_direct_messages(
                     )
                 )
             ).scalars()
-        threads.append((anybox_object, convo, actors))
+        threads.append((anybox_object, convo, actors, has_actors))
 
     return await templates.render_template(
         db_session,
diff --git a/app/templates/admin_direct_messages.html b/app/templates/admin_direct_messages.html
index 88ab312..3a7cdfd 100644
--- a/app/templates/admin_direct_messages.html
+++ b/app/templates/admin_direct_messages.html
@@ -7,13 +7,15 @@
 
 {% block content %}
 
-{% for anybox_object, convo, actors in threads %}
+{% for anybox_object, convo, actors, has_actors in threads %}
     <div class="actor-action">
+    {% if has_actors %}
     With {% for actor in actors %}
     <a href="{{ url_for("admin_profile") }}?actor_id={{ actor.ap_id }}">
         {{ actor.handle }}
     </a>
     {% endfor %}
+    {% endif %}
     </div>
     {{ utils.display_object(anybox_object) }}
 {% endfor %}
diff --git a/rebuild.sh b/rebuild.sh
new file mode 100755
index 0000000..9222bee
--- /dev/null
+++ b/rebuild.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -xe
+
+sudo docker compose build
+sudo docker compose down
+sudo docker compose up -d