From 44a492ad7527b701e668fe2ec62764fdce60f49d Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Wed, 22 Dec 2021 07:00:26 -0600
Subject: [PATCH] fix

---
 .../CHRISTMAS/sidebars/SubmissionSidebar.html      | 14 ++++++++++----
 files/templates/CHRISTMAS/submission_listing.html  | 14 ++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html b/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html
index dfdd6b0345..1ae381b597 100644
--- a/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html
@@ -91,12 +91,18 @@
 				<span class="badge badge-yellow">Country Club</span>
 			</li>
 			{% endif %}
-			<!-- Stickied -->
-			{% if p.stickied %}
+			{% if p.stickied and p.stickied.startswith('t:') %}
 			<li>
-				<span class="badge badge-pink">
+				<span id="pinned-{{p.id}}" class="badge badge-pink" data-bs-toggle="tooltip" data-bs-placement="bottom" data-timestamp={{p.stickied[2:]}} onmouseover="pinned_timestamp('pinned-{{p.id}}')"}>
 					<i class="fas fa-thumbtack fa-rotate--45 fa-sm fa-fw"></i>
-					Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}
+					Pinned
+				</span>
+			</li>
+			{% elif p.stickied %}
+			<li>
+				<span id="pinned-{{p.id}}" class="badge badge-pink" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Pinned by @{{p.stickied}}">
+					<i class="fas fa-thumbtack fa-rotate--45 fa-sm fa-fw"></i>
+					Pinned
 				</span>
 			</li>
 			{% endif %}
diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 698d2a3185..3b62e054de 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -194,20 +194,18 @@
 					</li>
 					{% endif %}
 					<!-- Stickied -->
-					{% if p.stickied %}
+					{% if p.stickied and p.stickied.startswith('t:') %}
 					<li>
-						<span class="badge badge-pink">
+						<span id="pinned-{{p.id}}" class="badge badge-pink" data-bs-toggle="tooltip" data-bs-placement="bottom" data-timestamp={{p.stickied[2:]}} onmouseover="pinned_timestamp('pinned-{{p.id}}')"}>
 							<i class="fas fa-thumbtack fa-rotate--45 fa-sm fa-fw"></i>
-							Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}
+							Pinned
 						</span>
 					</li>
-					{% endif %}
-					<!-- Pinned -->
-					{% if p.is_pinned and request.path.startswith('/@') %}
+					{% elif p.stickied %}
 					<li>
-						<span class="badge badge-green">
+						<span id="pinned-{{p.id}}" class="badge badge-pink" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Pinned by @{{p.stickied}}">
 							<i class="fas fa-thumbtack fa-rotate--45 fa-sm fa-fw"></i>
-							Pinned to profile
+							Pinned
 						</span>
 					</li>
 					{% endif %}