From bf70ddd3483eba3f76fab53f7e17750588af2c90 Mon Sep 17 00:00:00 2001
From: Ryan Barrett <git@ryanb.org>
Date: Mon, 29 Apr 2024 11:26:28 -0700
Subject: [PATCH] user pages UI: don't show user in every activity on profile
 and feed pages

it's redundant
---
 models.py                    |  3 +--
 templates/activities.html    | 10 +++++++---
 templates/home.html          |  1 +
 templates/notifications.html |  1 +
 templates/profile.html       |  1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/models.py b/models.py
index e8b34e4..9ab7b8c 100644
--- a/models.py
+++ b/models.py
@@ -952,8 +952,7 @@ class Object(StringIdModel):
         """
         attrs = {'class': 'h-card u-author'}
 
-        if (self.source_protocol in ('web', 'webmention', 'ui')
-                and (user.key in self.users or user.key.id() in self.domains)):
+        if user.key in self.users or user.key.id() in self.domains:
             # outbound; show a nice link to the user
             return user.user_link()
 
diff --git a/templates/activities.html b/templates/activities.html
index 8031c9d..88f7b88 100644
--- a/templates/activities.html
+++ b/templates/activities.html
@@ -3,10 +3,14 @@
 {% for obj in objects %}
 <li class="row h-entry">
   <div class="e-content col-xs-{{ 5 if show_users else 8 }}">
-    {% if obj.source_protocol %}
-      <span class="logo">{{ PROTOCOLS[obj.source_protocol].LOGO_HTML|safe }}</span>
+    {% if show_activity_actors %}
+      {% if obj.source_protocol %}
+        <span class="logo">{{ PROTOCOLS[obj.source_protocol].LOGO_HTML|safe }}</span>
+      {% endif %}
+      {{ obj.actor_link(user=user)|safe }}
+    {% else %}
+      ...
     {% endif %}
-    {{ obj.actor_link(user=user)|safe }}
     {{ obj.phrase|safe }}
     {% if obj.url %}<a target="_blank" href="{{ obj.url }}" class="u-url">{% endif %}
       {{ obj.content|default('--', true)|striptags|truncate(50) }}
diff --git a/templates/home.html b/templates/home.html
index 14cdf7c..d6dcf5c 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -1,5 +1,6 @@
 {% extends "user_base.html" %}
 {% set tab = "home" %}
+{% set show_activity_actors = True %}
 
 {% block subtabs %}
 <div class="row">
diff --git a/templates/notifications.html b/templates/notifications.html
index aeacefc..a99ee1b 100644
--- a/templates/notifications.html
+++ b/templates/notifications.html
@@ -1,5 +1,6 @@
 {% extends "user_base.html" %}
 {% set tab = "notifications" %}
+{% set show_activity_actors = True %}
 
 {% block subtabs %}
 <div class="row">
diff --git a/templates/profile.html b/templates/profile.html
index 6861d0d..73d4ccb 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -1,5 +1,6 @@
 {% extends "user_base.html" %}
 {% set tab = "profile" %}
+{% set show_activity_actors = False %}
 
 {% block subtabs %}
 <div class="row tabs">