From 0322b329e826fe567e8a28073e707b87c1b8868d Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Fri, 12 Jan 2024 08:24:05 +0200
Subject: [PATCH] dedup + tabs

---
 files/templates/comments.html    | 40 +++++++++++++++++++++++++-------
 files/templates/util/macros.html | 12 +++++-----
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 5b6a0451d..ed05028f6 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -137,17 +137,41 @@
 								<i class="fas fa-face-sleeping text-danger mr-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User was chudded for this comment {{c.chuddedfor}}"></i>
 							{% endif %}
 
-							{% if c.active_reports(v) %}<button type="button" class="btn btn-primary mx-1" style="padding:1px 5px; font-size:10px" data-toggleelement="#reports-{{c.id}}" data-toggleattr="d-none">{{c.active_reports(v)}} Report{{macros.plural(c.active_reports(v))}}</button>{% endif %}
-							{% if c.nsfw %}<span class="badge badge-danger text-small-extra mr-1">NSFW</span>{% endif %}
-							{% if v and v.can_see_shadowbanned and c.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title='Shadowbanned by @{{c.author.shadowbanner}} for "{{c.author.ban_reason}}"' data-bs-html="true"></i>{% endif %}
+							{% if c.active_reports(v) %}
+								<button type="button" class="btn btn-primary mx-1" style="padding:1px 5px; font-size:10px" data-toggleelement="#reports-{{c.id}}" data-toggleattr="d-none">{{c.active_reports(v)}} Report{{macros.plural(c.active_reports(v))}}</button>
+							{% endif %}
+
+							{% if c.nsfw %}
+								<span class="badge badge-danger text-small-extra mr-1">NSFW</span>
+							{% endif %}
+
+							{% with user = c.author %}
+								{%- include 'admin/shadowbanned_tooltip.html' -%}
+							{% endwith %}
+
 							{% if c.stickied %}
 								<i id='pinned-{{c.id}}'class="fas fa-thumbtack fa-rotate--45 pr-1 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned by @{{c.stickied}}" {% if c.stickied_utc %}data-onmouseover="pinned_timestamp('pinned-{{c.id}}')" data-timestamp={{c.stickied_utc}} data-nonce="{{g.nonce}}"{% endif %}></i>
 							{% endif %}
-							{% if c.distinguish_level and not c.ghost %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>{% endif %}
-							{% if c.is_op %}<i class="fas fa-microphone-stand text-info" data-bs-toggle="tooltip" data-bs-placement="bottom" title="OP"></i>{% endif %}
-							{% if c.is_bot %}<i class="fas fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Bot"></i>{% endif %}
-							{% if c.is_blocking and not c.ghost %}<i class="fas fa-user-minus text-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" title="You're blocking this user."></i>{% endif %}
-							{% if c.is_blocked and not c.ghost %}<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="This user is blocking you."></i>{% endif %}
+
+							{% if c.distinguish_level and not c.ghost %}
+								<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>
+							{% endif %}
+
+							{% if c.is_op %}
+								<i class="fas fa-microphone-stand text-info" data-bs-toggle="tooltip" data-bs-placement="bottom" title="OP"></i>
+							{% endif %}
+
+							{% if c.is_bot %}
+								<i class="fas fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Bot"></i>
+							{% endif %}
+
+							{% if c.is_blocking and not c.ghost %}
+								<i class="fas fa-user-minus text-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" title="You're blocking this user."></i>
+							{% endif %}
+
+							{% if c.is_blocked and not c.ghost %}
+								<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="This user is blocking you."></i>
+							{% endif %}
 
 							{% if c.ghost %}
 								<span {% if c.distinguish_level %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %}>👻</span>
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index eb3bcc179..ed379a736 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -39,9 +39,9 @@
 		</span>
 	{% endfor %}
 
-	{% if v and v.can_see_shadowbanned and p.author.shadowbanned %}
-		<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title='Shadowbanned by @{{p.author.shadowbanner}} for "{{p.author.ban_reason}}"' data-bs-html="true"></i>
-	{% endif %}
+	{% with user = p.author %}
+		{%- include 'admin/shadowbanned_tooltip.html' -%}
+	{% endwith %}
 
 	{% if p.stickied %}
 		<i id='pinned-{{p.id}}' class="fas fa-thumbtack fa-rotate--45 pr-1 ml-1 mt-3 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned by @{{p.stickied}}" {% if p.stickied_utc %}data-onmouseover="pinned_timestamp('pinned-{{p.id}}')" data-timestamp={{p.stickied_utc}} data-nonce="{{g.nonce}}"{% endif %}></i>
@@ -219,9 +219,9 @@
 			<ul class="mt-1 mb-0" style="padding-left:20px;word-wrap:break-word">
 				{% for r in i.filtered_reports(v) %}
 					<li>
-						{% if v and v.can_see_shadowbanned and r.user.shadowbanned %}
-							<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title='Shadowbanned by @{{r.user.shadowbanner}} for "{{r.user.ban_reason}}"' data-bs-html="true"></i>
-						{% endif %}
+						{% with user = r.user %}
+							{%- include 'admin/shadowbanned_tooltip.html' -%}
+						{% endwith %}
 						<a style="font-weight:bold" href="{{r.user.url}}">{{r.user.username}}</a>
 						{% if r.reason %}: {{r.realreason(v) | safe}}{% endif %}
 						{% if v and v.admin_level >= PERMS['REPORTS_REMOVE'] %}