From 505abd7da8ccd33d99b8fcd55535abed6e343ecb Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Fri, 26 Aug 2022 07:57:10 +0200
Subject: [PATCH] Only display tiny actor icon for shares

---
 app/scss/main.scss                       | 1 -
 app/templates/admin_direct_messages.html | 2 +-
 app/templates/admin_inbox.html           | 2 +-
 app/templates/notifications.html         | 2 +-
 app/templates/utils.html                 | 4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/scss/main.scss b/app/scss/main.scss
index 5145c3e..f02b091 100644
--- a/app/scss/main.scss
+++ b/app/scss/main.scss
@@ -205,7 +205,6 @@ footer {
 .tiny-actor-icon {
   max-width: 24px;
   max-height: 24px;
-  margin-right: 5px;
   position: relative;
   top: 5px;
 }
diff --git a/app/templates/admin_direct_messages.html b/app/templates/admin_direct_messages.html
index 38bc994..c6a2319 100644
--- a/app/templates/admin_direct_messages.html
+++ b/app/templates/admin_direct_messages.html
@@ -11,7 +11,7 @@
     <div class="actor-action">
     With {% for actor in actors %}
     <a href="{{ url_for("admin_profile") }}?actor_id={{ actor.ap_id }}">
-        {{ utils.display_tiny_actor_icon(actor) }} {{ actor.handle }}
+        {{ actor.handle }}
     </a>
     {% endfor %}
     </div>
diff --git a/app/templates/admin_inbox.html b/app/templates/admin_inbox.html
index 618a43f..097d1a2 100644
--- a/app/templates/admin_inbox.html
+++ b/app/templates/admin_inbox.html
@@ -19,7 +19,7 @@
 
 {% for inbox_object in inbox %}
 {% if inbox_object.ap_type == "Announce" %}
-    {{ utils.actor_action(inbox_object, "shared") }}
+    {{ utils.actor_action(inbox_object, "shared", with_icon=True) }}
     {{ utils.display_object(inbox_object.relates_to_anybox_object) }}
 {% elif inbox_object.ap_type in ["Article", "Note", "Video", "Page", "Question"] %}
 {{ utils.display_object(inbox_object) }}
diff --git a/app/templates/notifications.html b/app/templates/notifications.html
index 7f6277b..a67c782 100644
--- a/app/templates/notifications.html
+++ b/app/templates/notifications.html
@@ -7,7 +7,7 @@
 
 {% macro notif_actor_action(notif, text) %}
     <div class="actor-action">
-        <a href="{{ url_for("admin_profile") }}?actor_id={{ notif.actor.ap_id }}">{{ utils.display_tiny_actor_icon(notif.actor) }} {{ notif.actor.display_name | clean_html(notif.actor) | safe }}</a> {{ text }}
+        <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 %}
diff --git a/app/templates/utils.html b/app/templates/utils.html
index ea5aaf4..bc22688 100644
--- a/app/templates/utils.html
+++ b/app/templates/utils.html
@@ -184,10 +184,10 @@
     <img class="tiny-actor-icon" src="{{ actor.resized_icon_url }}" alt="{{ actor.display_name }}'s avatar">
 {% endmacro %}
 
-{% macro actor_action(inbox_object, text) %}
+{% macro actor_action(inbox_object, text, with_icon=False) %}
     <div class="actor-action">
         <a href="{{ url_for("admin_profile") }}?actor_id={{ inbox_object.actor.ap_id }}">
-            {{ display_tiny_actor_icon(inbox_object.actor) }} {{ inbox_object.actor.display_name | clean_html(inbox_object.actor) | safe }}
+            {% if with_icon %}{{ display_tiny_actor_icon(inbox_object.actor) }}{% endif %} {{ inbox_object.actor.display_name | clean_html(inbox_object.actor) | safe }}
         </a> {{ text }}
         <span title="{{ inbox_object.ap_published_at.isoformat() }}">{{ inbox_object.ap_published_at | timeago }}</span>
     </div>