From 672599e997c90e21b0341181baa1139461a64d06 Mon Sep 17 00:00:00 2001
From: Yo Mama <yomamahasade@outlook.com>
Date: Wed, 20 Oct 2021 23:49:02 +0200
Subject: [PATCH] Maintain the original in html, but also adds a js that
 rewrites it to human-readable date

---
 files/templates/submission.html         | 11 ++++++++++-
 files/templates/submission_listing.html | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index 4340ddb9e..9e9358c56 100755
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -375,7 +375,7 @@
 							{% endfor %}
 						{% endif %}
 						{% if v and v.admin_level==6 and p.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Shadowbanned by @{{p.author.shadowbanned}}"></i>{% endif %}
-						{% if p.stickied %}<i class="fas fa-thumbtack fa-fw text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}"></i>{% endif %}
+						{% if p.stickied %}<i id="pinned-{{p.id}}" class="fas fa-thumbtack fa-fw text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}"></i>{% endif %}
 						{% if p.is_pinned %}<i class="fas fa-thumbtack fa-fw text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Pinned to profile"></i>{% endif %}
 						{% if p.distinguish_level %} <i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{'SITE_NAME' | app_config}} Admin, speaking officially"></i>{% endif %}
 						{% if p.is_bot %} <i class="fad fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom"	title="" data-bs-original-title="Bot"></i>{% endif %}
@@ -822,6 +822,15 @@
 			comments['{{p.id}}'] = { c: newTotal, t: Date.now() }
 			window.localStorage.setItem("comment-counts", JSON.stringify(comments))
 		{% endif %}
+
+    {% if p.stickied %}
+      const pinned_info = document.getElementById('pinned-{{p.id}}')
+      {% if p.stickied.startswith('t:') %}
+        pinned_info.setAttribute("data-bs-original-title", `Pinned until ${Date({{p.stickied[2:]}}).toString()}`)
+      {% else %}
+        pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{p.stickied}}")
+      {%endif%}
+    {%endif%}
 	})()
 </script>
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 2e2b16afa..638821b9f 100755
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -80,6 +80,15 @@
 		{% if (not v or v.highlightcomments) %}
 			showNewCommentCounts('{{p.id}}', {{p.comment_count}})
 		{% endif %}
+
+    {% if p.stickied %}
+      const pinned_info = document.getElementById('pinned-{{p.id}}')
+      {% if p.stickied.startswith('t:') %}
+        pinned_info.setAttribute("data-bs-original-title", `Pinned until ${Date({{p.stickied[2:]}}).toString()}`)
+      {% else %}
+        pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{p.stickied}}")
+      {%endif%}
+    {%endif%}
 	})()
 </script>
 
@@ -174,7 +183,7 @@
 					{% endfor %}
 				{% endif %}
 				{% if v and v.admin_level==6 and p.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Shadowbanned by @{{p.author.shadowbanned}}"></i>{% endif %}
-				{% if p.stickied %}<i class="fas fa-thumbtack text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}"></i>{% endif %}
+				{% if p.stickied %}<i id='pinned-{{ p.id }}' class="fas fa-thumbtack text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}"></i>{% endif %}
 				{% if p.distinguish_level %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{'SITE_NAME' | app_config}} Admin, speaking officially"></i>{% endif %}
 				{% if p.is_pinned and request.path.startswith('/@') %}<i class="fas fa-thumbtack text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Pinned to profile"></i>{% endif %}
 				{% if p.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}