From 382df30e1fa4121716bb65c69494607ba6183166 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sat, 9 Jul 2022 10:35:47 +0200
Subject: [PATCH] show ALL timestamps in user's timezone + move scripts to the
 bottom of HTML templates to mimic rocketloader's behavior on localhost (for
 testing)

---
 files/classes/badges.py                 |  35 +++--
 files/helpers/jinja2.py                 |   3 +-
 files/routes/front.py                   |   2 +-
 files/templates/admins.html             |   5 +-
 files/templates/badges.html             |   4 +-
 files/templates/ban_modal.html          |   6 +-
 files/templates/chat.html               |   3 +-
 files/templates/default.html            |   3 +-
 files/templates/delete_post_modal.html  |   4 +-
 files/templates/followers.html          |   3 +-
 files/templates/following.html          |   3 +-
 files/templates/home.html               |  58 ++++----
 files/templates/login.html              |   4 +-
 files/templates/poll_votes.html         |   4 +-
 files/templates/settings.html           |   4 +-
 files/templates/settings2.html          |   4 +-
 files/templates/settings_blocks.html    |   4 +-
 files/templates/settings_profile.html   |  21 +--
 files/templates/settings_security.html  |   4 +-
 files/templates/sign_up.html            |   4 +-
 files/templates/sign_up_failed_ref.html |   4 +-
 files/templates/sub/subs.html           |   5 +-
 files/templates/submission.html         | 172 ++++++++++++------------
 files/templates/submit.html             |   3 +-
 files/templates/userpage.html           |  14 +-
 files/templates/userpage_comments.html  |   2 +-
 files/templates/userpage_private.html   |  10 +-
 files/templates/util/assetcache.html    |   4 +-
 files/templates/votes.html              |   5 +-
 29 files changed, 207 insertions(+), 190 deletions(-)

diff --git a/files/classes/badges.py b/files/classes/badges.py
index e298869f3..832f1a6bd 100644
--- a/files/classes/badges.py
+++ b/files/classes/badges.py
@@ -39,24 +39,33 @@ class Badge(Base):
 	def __repr__(self):
 		return f"<Badge(user_id={self.user_id}, badge_id={self.badge_id})>"
 
+	@property
+	@lazy
+	def until(self):
+		if self.badge_id == 28: return self.user.agendaposter
+		if self.badge_id == 94: return self.user.progressivestack
+		if self.badge_id == 95: return self.user.bird
+		if self.badge_id == 96: return self.user.flairchanged
+		if self.badge_id == 97: return self.user.longpost
+		if self.badge_id == 98: return self.user.marseyawarded
+		if self.badge_id == 109: return self.user.rehab
+		return None
+
 	@property
 	@lazy
 	def text(self):
-		if self.name == "Chud":
-			ti = self.user.agendaposter
-			if ti: text = self.badge.description + " until " + datetime.utcfromtimestamp(ti).strftime('%Y-%m-%d %H:%M:%S')
+		if self.badge_id == 28:
+			if ti: text = self.badge.description + " until"
 			else: text = self.badge.description + " permanently"
 		elif self.badge_id in {94,95,96,97,98,109}:
-			if self.badge_id == 94: ti = self.user.progressivestack
-			elif self.badge_id == 95: ti = self.user.bird
-			elif self.badge_id == 96: ti = self.user.flairchanged
-			elif self.badge_id == 97: ti = self.user.longpost
-			elif self.badge_id == 98: ti = self.user.marseyawarded
-			elif self.badge_id == 109: ti = self.user.rehab
-			text = self.badge.description + " until " + datetime.utcfromtimestamp(ti).strftime('%Y-%m-%d %H:%M:%S')
-		elif self.description: text = self.description
-		elif self.badge.description: text = self.badge.description
-		else: return self.name
+			text = self.badge.description + " until"
+		elif self.description:
+			text = self.description
+		elif self.badge.description:
+			text = self.badge.description
+		else:
+			return self.name
+		
 		return f'{self.name} - {text}'
 
 	@property
diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py
index aefa4417e..40e0ca164 100644
--- a/files/helpers/jinja2.py
+++ b/files/helpers/jinja2.py
@@ -3,7 +3,6 @@ from .get import *
 from os import listdir, environ
 from .const import * 
 import time
-from datetime import datetime
 
 @app.template_filter("post_embed")
 def post_embed(id, v):
@@ -54,7 +53,7 @@ def inject_constants():
 			"AUTOJANNY_ID":AUTOJANNY_ID, "PUSHER_ID":PUSHER_ID, 
 			"CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID, 
 			"PIZZASHILL_ID":PIZZASHILL_ID, "DEFAULT_COLOR":DEFAULT_COLOR, 
-			"COLORS":COLORS, "ADMIGGERS":ADMIGGERS, "datetime":datetime, "time":time,
+			"COLORS":COLORS, "ADMIGGERS":ADMIGGERS, "time":time,
 			"HOLE_NAME": HOLE_NAME, "HOLE_STYLE_FLAIR": HOLE_STYLE_FLAIR, "HOLE_REQUIRED": HOLE_REQUIRED,
 			"LOTTERY_ENABLED": LOTTERY_ENABLED, "GUMROAD_LINK": GUMROAD_LINK,
 			"DEFAULT_THEME": DEFAULT_THEME, "DESCRIPTION": DESCRIPTION, "PERMS": PERMS,
diff --git a/files/routes/front.py b/files/routes/front.py
index 192cfd304..614775422 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -246,7 +246,7 @@ def random_user(v):
 	u = g.db.query(User.username).filter(User.song != None).order_by(func.random()).first()
 	
 	if u: u = u[0]
-	else: abort(404)
+	else: return "No users have set a profile anthem so far!"
 
 	return redirect(f"/@{u}")
 
diff --git a/files/templates/admins.html b/files/templates/admins.html
index 895b216e2..985875e53 100644
--- a/files/templates/admins.html
+++ b/files/templates/admins.html
@@ -4,8 +4,6 @@
 
 {% block content %}
 
-<script src="/assets/js/sort_table.js?v=243"></script>
-
 <pre class="d-none d-md-inline-block"></pre>
 <h5 style="font-weight:bold;">Admins</h5>
 <pre></pre>
@@ -30,4 +28,7 @@
 		{% endfor %}
 	</table>
 </div>
+
+<script src="/assets/js/sort_table.js?v=243"></script>
+
 {% endblock %}
diff --git a/files/templates/badges.html b/files/templates/badges.html
index d61f65b66..37852ce2d 100644
--- a/files/templates/badges.html
+++ b/files/templates/badges.html
@@ -1,6 +1,5 @@
 {% extends "default.html" %}
 {% block content %}
-<script src="/assets/js/sort_table.js?v=243"></script>
 <pre>
 
 
@@ -37,4 +36,7 @@
 		{% endfor %}
 	</table>
 </div>
+
+<script src="/assets/js/sort_table.js?v=243"></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html
index c619fecfa..a5a9860cb 100644
--- a/files/templates/ban_modal.html
+++ b/files/templates/ban_modal.html
@@ -1,6 +1,4 @@
 
-<script src="/assets/js/ban_modal.js?v=242"></script>
-
 <div class="modal fade" id="banModal" tabindex="-1" role="dialog" aria-labelledby="banModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
@@ -35,4 +33,6 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<script src="/assets/js/ban_modal.js?v=242"></script>
\ No newline at end of file
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 915e94fcb..459efa804 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -109,8 +109,6 @@
 </head>
 
 <body>
-	<script src="{{asset('js/bootstrap.js')}}"></script>
-
 	{% include "header.html" %}
 	
 	<div class="container pb-4">
@@ -196,6 +194,7 @@
 <input id="site_name" type="hidden" value="{{SITE_NAME}}">
 <input id="slurreplacer" type="hidden" value="{{v.slurreplacer}}">
 
+<script src="{{asset('js/bootstrap.js')}}"></script>
 <script src="/chat.js?v=23"></script>
 
 {% include "emoji_modal.html" %}
diff --git a/files/templates/default.html b/files/templates/default.html
index 94ff38d8e..553ba4616 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -11,7 +11,6 @@
 		<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' ajax.cloudflare.com; connect-src 'self'; object-src 'none';">
 	{% endif %}
 
-	<script src="{{asset('js/bootstrap.js')}}"></script>
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
 		<link rel="stylesheet" href="{{asset('css/main.css')}}">
@@ -377,6 +376,8 @@
 	</div>
 </div>
 
+<script src="{{asset('js/bootstrap.js')}}"></script>
+
 <script src="{{asset('js/lozad.js')}}"></script>
 
 {% if v %}
diff --git a/files/templates/delete_post_modal.html b/files/templates/delete_post_modal.html
index 05381601c..8eac25a0c 100644
--- a/files/templates/delete_post_modal.html
+++ b/files/templates/delete_post_modal.html
@@ -1,5 +1,3 @@
-<script src="/assets/js/delete_post_modal.js?v=240"></script>
-
 <div class="modal fade" id="deletePostModal" tabindex="-1" role="dialog" aria-labelledby="deletePostModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
@@ -28,3 +26,5 @@
 		</div>
 	</div>
 </div>
+
+<script src="/assets/js/delete_post_modal.js?v=240"></script>
\ No newline at end of file
diff --git a/files/templates/followers.html b/files/templates/followers.html
index b167c0b33..9dbff40fc 100644
--- a/files/templates/followers.html
+++ b/files/templates/followers.html
@@ -1,6 +1,5 @@
 {% extends "default.html" %}
 {% block content %}
-<script src="/assets/js/followers.js?v=241"></script>
 <pre>
 
 	
@@ -30,4 +29,6 @@
 </tbody>
 </table>
 
+<script src="/assets/js/followers.js?v=241"></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/following.html b/files/templates/following.html
index 55630df99..94316e19e 100644
--- a/files/templates/following.html
+++ b/files/templates/following.html
@@ -1,6 +1,5 @@
 {% extends "default.html" %}
 {% block content %}
-<script src="/assets/js/following.js?v=241"></script>
 <pre>
 
 	
@@ -30,4 +29,6 @@
 </tbody>
 </table>
 
+<script src="/assets/js/following.js?v=241"></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/home.html b/files/templates/home.html
index 6b1e98ff5..1b3521301 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -9,35 +9,6 @@
 		}
 	</style>
 {% endif %}
-
-{% if v and FP %}
-	{% if not v.fp %}
-		<script>
-			function fp(fp) {
-				const xhr = new XMLHttpRequest();
-				xhr.open("POST", '/fp/'+fp);
-				xhr.setRequestHeader('xhr', 'xhr');
-				var form = new FormData()
-				form.append("formkey", formkey());
-				xhr.send(form);
-			};
-
-			const fpPromise = new Promise((resolve, reject) => {
-				const script = document.createElement('script');
-				script.onload = resolve;
-				script.onerror = reject;
-				script.async = true;
-				script.src = "/assets/js/fp.js?v=240";
-				document.head.appendChild(script);
-			})
-				.then(() => FingerprintJS.load({token: '{{FP}}'}));
-
-			fpPromise
-				.then(fp => fp.get())
-				.then(result => {if (result.visitorId != '{{v.fp}}') fp(result.visitorId);})
-		</script>
-	{% endif %}
-{% endif %}
   
 <div class="row" style="overflow: visible;padding-top:5px;">
 	<div class="col">
@@ -243,4 +214,33 @@
 	</style>
 {% endif %}
 
+{% if v and FP %}
+	{% if not v.fp %}
+		<script>
+			function fp(fp) {
+				const xhr = new XMLHttpRequest();
+				xhr.open("POST", '/fp/'+fp);
+				xhr.setRequestHeader('xhr', 'xhr');
+				var form = new FormData()
+				form.append("formkey", formkey());
+				xhr.send(form);
+			};
+
+			const fpPromise = new Promise((resolve, reject) => {
+				const script = document.createElement('script');
+				script.onload = resolve;
+				script.onerror = reject;
+				script.async = true;
+				script.src = "/assets/js/fp.js?v=240";
+				document.head.appendChild(script);
+			})
+				.then(() => FingerprintJS.load({token: '{{FP}}'}));
+
+			fpPromise
+				.then(fp => fp.get())
+				.then(result => {if (result.visitorId != '{{v.fp}}') fp(result.visitorId);})
+		</script>
+	{% endif %}
+{% endif %}
+
 {% endblock %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 68487ab70..662c50145 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -9,8 +9,6 @@
 	<meta name="description" content="{{DESCRIPTION}}">
 	<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
 
-	<script src="{{asset('js/bootstrap.js')}}"></script>
-
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
@@ -120,6 +118,8 @@
 		</div>
 </div>
 
+<script src="{{asset('js/bootstrap.js')}}"></script>
+
 </body>
 
 </html>
diff --git a/files/templates/poll_votes.html b/files/templates/poll_votes.html
index 2da9149eb..1a40dc55f 100644
--- a/files/templates/poll_votes.html
+++ b/files/templates/poll_votes.html
@@ -9,8 +9,6 @@
 
 {% if thing %}
 
-<script src="/assets/js/sort_table.js?v=243"></script>
-
 <pre>
 	
 </pre>
@@ -43,6 +41,8 @@
 	</table>
 </div>
 
+<script src="/assets/js/sort_table.js?v=243"></script>
+
 {% endif %}
 
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 9599fb1be..2487a8f66 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -6,8 +6,6 @@
 	<meta name="description" content="{{DESCRIPTION}}">
 	<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
 
-	<script src="{{asset('js/bootstrap.js')}}"></script>
-
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
@@ -262,6 +260,8 @@
 
 {% block onload %}{% endblock %}
 
+<script src="{{asset('js/bootstrap.js')}}"></script>
+
 <script src="/assets/js/clipboard.js?v=240"></script>
 
 </body>
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index ca9cad2c5..845db65d4 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -7,8 +7,6 @@
 	<meta name="description" content="{{DESCRIPTION}}">
 	<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
 
-	<script src="{{asset('js/bootstrap.js')}}"></script>
-
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
@@ -172,6 +170,8 @@
 {% block scripts %}
 {% endblock %}
 
+<script src="{{asset('js/bootstrap.js')}}"></script>
+
 </body>
 
 </html>
\ No newline at end of file
diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html
index 2b74e48f3..366493a9f 100644
--- a/files/templates/settings_blocks.html
+++ b/files/templates/settings_blocks.html
@@ -4,8 +4,6 @@
 
 {% block content %}
 
-<script src="/assets/js/settings_blocks.js?v=241"></script>
-
 <div class="row">
 
 	<div class="col">
@@ -118,4 +116,6 @@
 	</div>
 </div>
 
+<script src="/assets/js/settings_blocks.js?v=241"></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index ba4f92e0c..273eb4183 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -463,14 +463,9 @@
 								<label class="text-black w-lg-25">Flair</label>
 
 								<div class="w-lg-100">
-									
-									{% if v.flairchanged %}
-										{% set ti = datetime.utcfromtimestamp(v.flairchanged).strftime('%Y-%m-%d %H:%M:%S') %}
-									{% endif %}
-								
 									<form id="profile-settings" action="/settings/title_change" method="post">
 										<input type="hidden" name="formkey" value="{{v.formkey}}">
-										<input maxlength=100 {% if v.flairchanged %}disabled{% endif %} autocomplete="off" id="customtitlebody" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if v.flairchanged %}Your flair has been locked until {{ti}}{% elif v.customtitleplain %}{{v.customtitleplain}}{% endif %}">
+										<input maxlength=100 {% if v.flairchanged %}disabled{% endif %} autocomplete="off" id="customtitlebody" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if v.customtitleplain %}{{v.customtitleplain}}{% endif %}">
 										<div class="d-flex mt-2">
 											<a class="format" role="button"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('customtitlebody')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="Add Emoji"></i></a>
 											&nbsp;&nbsp;&nbsp;
@@ -738,9 +733,17 @@
 </div>
 
 
-<script src="/assets/js/settings_profile.js?v=256"></script>
-
 {% include "emoji_modal.html" %}
 {% include "gif_modal.html" %}
 
-{% endblock %}
+{% if v.flairchanged %}
+	<script>
+		const date = new Date({{v.flairchanged}}*1000).toString();
+		const text = ` - Your flair has been locked until ${date}`
+		document.getElementById('customtitlebody').value += text;
+	</script>
+{% endif %}
+
+<script src="/assets/js/settings_profile.js?v=256"></script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index 73eaf727d..d761b8482 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -4,8 +4,6 @@
 
 {% block content %}
 
-<script src="/assets/js/settings_security.js?v=241"></script>
-
 <div class="row">
 
 <div class="col col-lg-8">
@@ -265,4 +263,6 @@
 </div>
 </div>
 
+<script src="/assets/js/settings_security.js?v=241"></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 025882988..0758adeb7 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -8,8 +8,6 @@
 	<meta name="description" content="{{DESCRIPTION}}">
 		<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
 
-		<script src="{{asset('js/bootstrap.js')}}"></script>
-
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
@@ -151,6 +149,8 @@
 		</div>
 </div>
 
+<script src="{{asset('js/bootstrap.js')}}"></script>
+
 <script src="/assets/js/signup.js?v=240"></script>
 
 {% if hcaptcha %}
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 8f29e2026..7a4f41a40 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -9,8 +9,6 @@
 	<meta name="description" content="{{DESCRIPTION}}">
 		<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
 
-		<script src="{{asset('js/bootstrap.js')}}"></script>
-
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
@@ -102,6 +100,8 @@
 		</div>
 </div>
 
+<script src="{{asset('js/bootstrap.js')}}"></script>
+
 </body>
 
 </html>
diff --git a/files/templates/sub/subs.html b/files/templates/sub/subs.html
index ae08eeb2a..2f3d634dd 100644
--- a/files/templates/sub/subs.html
+++ b/files/templates/sub/subs.html
@@ -1,7 +1,5 @@
 {% extends "default.html" %}
 {% block content %}
-<script src="/assets/js/sort_table.js?v=243"></script>
-
 <pre>
 
 	
@@ -31,4 +29,7 @@
 		{% endfor %}
 	</table>
 </div>
+
+<script src="/assets/js/sort_table.js?v=243"></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 5df09550a..11bc853a9 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -22,97 +22,12 @@
 	}
 </style>
 
-{% if success %}
-	<script>
-		history.pushState(null, null, '{{p.permalink}}');
-		localStorage.setItem("post_title", "")
-		localStorage.setItem("post_text", "")
-		localStorage.setItem("post_url", "")
-		localStorage.setItem("sub", "")
-	</script>
-{% endif %}
-
-
-{% if p.award_count("crab", v) %}
-	<script>
-		let audio = new Audio('/assets/media/crab.mp3');
-		audio.loop=true;
-
-		audio.play();
-		window.addEventListener('click', () => {
-			if (audio.paused) audio.play(); 
-		}, {once : true});
-	</script>
-{% endif %}
-
-{% if fart and not (v and v.has_badge(128)) %}
-	<script>
-		fart = Math.floor(Math.random() * 5) + 1
-		let audio = new Audio(`/assets/images/${fart}.webp`);
-
-		audio.play();
-		if (audio.paused) {
-			window.addEventListener('click', () => {
-				if (audio.paused) audio.play(); 
-			}, {once : true})
-		}
-	</script>
-{% endif %}
-
 {% if SITE_NAME == 'PCM' %}
 	{% set wholesome = '/i/wholesome.webp' %}
 {% else %}
 	{% set wholesome = '/e/marseywholesome.webp' %}
 {% endif %}
 
-{% if p.award_count("confetti", v) %}
-	<div id="post-award-confetti"></div>
-{% endif %}
-
-{% if p.award_count("firework", v) %}
-	<script src="/assets/js/fireworks.js?v=18"></script>
-	<div class="firework">
-		<img src="">
-	</div>
-
-	{% if p.award_count("firework", v) > 1 %}
-		<div class="firework">
-			<img src="">
-		</div>
-	{% endif %}
-
-	{% if p.award_count("firework", v) > 2 %}
-		<div class="firework">
-			<img src="">
-		</div>
-	{% endif %}
-
-	{% if p.award_count("firework", v) > 3 %}
-		<div class="firework">
-			<img src="">
-		</div>
-	{% endif %}
-{% endif %}
-
-{% if p.award_count("ricardo", v) %}
-	<script src="/assets/js/ricardo.js?v=18"></script>
-	<div id="ricardo1" class="ricardo ricardoleft">
-		<img src="/i/ricardo1.webp">
-	</div>
-
-	{% if p.award_count("ricardo", v) > 1 %}
-		<div id="ricardo2" class="ricardo">
-			<img src="/i/ricardo2.webp" style="max-height:200px">
-		</div>
-	{% endif %}
-
-	{% if p.award_count("ricardo", v) > 2 %}
-		<div id="ricardo3" class="ricardo">
-			<img src="/i/ricardo3.webp" style="max-height:150px">
-		</div>
-	{% endif %}
-{% endif %}
-
 {% if g.inferior_browser %}
 	{% if p.award_count("wholesome", v) %}
 		<style>
@@ -1216,4 +1131,91 @@
 		{% endif %}
 	})()
 </script>
+
+{% if success %}
+	<script>
+		history.pushState(null, null, '{{p.permalink}}');
+		localStorage.setItem("post_title", "")
+		localStorage.setItem("post_text", "")
+		localStorage.setItem("post_url", "")
+		localStorage.setItem("sub", "")
+	</script>
+{% endif %}
+
+
+{% if p.award_count("crab", v) %}
+	<script>
+		let audio = new Audio('/assets/media/crab.mp3');
+		audio.loop=true;
+
+		audio.play();
+		window.addEventListener('click', () => {
+			if (audio.paused) audio.play(); 
+		}, {once : true});
+	</script>
+{% endif %}
+
+{% if fart and not (v and v.has_badge(128)) %}
+	<script>
+		fart = Math.floor(Math.random() * 5) + 1
+		let audio = new Audio(`/assets/images/${fart}.webp`);
+
+		audio.play();
+		if (audio.paused) {
+			window.addEventListener('click', () => {
+				if (audio.paused) audio.play(); 
+			}, {once : true})
+		}
+	</script>
+{% endif %}
+
+
+{% if p.award_count("confetti", v) %}
+	<div id="post-award-confetti"></div>
+{% endif %}
+
+{% if p.award_count("firework", v) %}
+	<script src="/assets/js/fireworks.js?v=18"></script>
+	<div class="firework">
+		<img src="">
+	</div>
+
+	{% if p.award_count("firework", v) > 1 %}
+		<div class="firework">
+			<img src="">
+		</div>
+	{% endif %}
+
+	{% if p.award_count("firework", v) > 2 %}
+		<div class="firework">
+			<img src="">
+		</div>
+	{% endif %}
+
+	{% if p.award_count("firework", v) > 3 %}
+		<div class="firework">
+			<img src="">
+		</div>
+	{% endif %}
+{% endif %}
+
+{% if p.award_count("ricardo", v) %}
+	<script src="/assets/js/ricardo.js?v=18"></script>
+	<div id="ricardo1" class="ricardo ricardoleft">
+		<img src="/i/ricardo1.webp">
+	</div>
+
+	{% if p.award_count("ricardo", v) > 1 %}
+		<div id="ricardo2" class="ricardo">
+			<img src="/i/ricardo2.webp" style="max-height:200px">
+		</div>
+	{% endif %}
+
+	{% if p.award_count("ricardo", v) > 2 %}
+		<div id="ricardo3" class="ricardo">
+			<img src="/i/ricardo3.webp" style="max-height:150px">
+		</div>
+	{% endif %}
+{% endif %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 5ec697265..0746020ca 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -6,8 +6,6 @@
 	<meta name="description" content="{{DESCRIPTION}}">
 		<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
 
-		<script src="{{asset('js/bootstrap.js')}}"></script>
-
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
@@ -225,6 +223,7 @@
 			</script>
 		{% endif %}
 
+		<script src="{{asset('js/bootstrap.js')}}"></script>
 		<script src="{{asset('js/marked.js')}}"></script>
 		<script src="{{asset('js/formatting.js')}}"></script>
 		<script src="{{asset('js/submit.js')}}"></script>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 87f892491..eca2ae100 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -340,13 +340,12 @@
 					</div>
 				</div>
 			</div>
-
 					<div id="profile--badges">
 						{% for b in u.badges %}
 							{% if b.url %}
-								<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}"></a>
+								<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>></a>
 							{% else %}
-								<img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}">
+								<img alt="{{b.name}}" width=55 height=60 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>
 							{% endif %}
 						{% endfor %}
 					</div>
@@ -478,9 +477,9 @@
 				<div class="mb-3" id="profile--badges">
 					{% for b in u.badges %}
 						{% if b.url %}
-							<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}"></a>
+							<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>></a>
 						{% else %}
-							<img alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}">
+							<img alt="{{b.name}}" width=29.33 height=32 loading="lazy" src="{{b.path}}?v=1021" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{b.text}}" {% if b.until %}data-until="{{b.until}}" onmouseover="badge_timestamp(this)"{% endif %}>>
 						{% endif %}
 					{% endfor %}
 				</div>
@@ -786,8 +785,9 @@
 </nav>
 {% endif %}
 
-<script src="{{asset('js/marked.js')}}"></script>
-
+{% if not request.path.endswith('/comments') %}
+	<script src="{{asset('js/marked.js')}}"></script>
+{% endif %}
 
 {% if v and v.id != u.id and '/comments' not in request.path %}
 	{% include "emoji_modal.html" %}
diff --git a/files/templates/userpage_comments.html b/files/templates/userpage_comments.html
index e41dd748c..823aee102 100644
--- a/files/templates/userpage_comments.html
+++ b/files/templates/userpage_comments.html
@@ -117,8 +117,8 @@
 
 {% if v %}
 <div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
-<script src="{{asset('js/userpage_v.js')}}"></script>
 <div id="username" class="d-none">{{u.username}}</div>
+<script src="{{asset('js/userpage_v.js')}}"></script>
 {% endif %}
 
 <script src="{{asset('js/userpage.js')}}"></script>
diff --git a/files/templates/userpage_private.html b/files/templates/userpage_private.html
index c62e20167..b04bfe6d9 100644
--- a/files/templates/userpage_private.html
+++ b/files/templates/userpage_private.html
@@ -31,14 +31,12 @@
 {% endif %}
 
 {% if v %}
-<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
-<script src="{{asset('js/userpage_v.js')}}"></script>
-<div id="username" class="d-none">{{u.username}}</div>
+	<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
+	<div id="username" class="d-none">{{u.username}}</div>
+	{%- include "emoji_modal.html" -%}
+	<script src="{{asset('js/userpage_v.js')}}"></script>
 {% endif %}
 
 <script src="{{asset('js/userpage.js')}}"></script>
 
-{% if v -%}
-	{%- include "emoji_modal.html" -%}
-{%- endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index 158f4f1a2..f3dbb6686 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -16,7 +16,7 @@ set CACHE_VER = {
 	'css/win98.css': 61,
 
 	'js/award_modal.js': 253,
-	'js/bootstrap.js': 274,
+	'js/bootstrap.js': 275,
 	'js/comments+submission_listing.js': 263,
 	'js/submission_listing.js': 261,
 	'js/emoji_modal.js': 297,
@@ -24,7 +24,7 @@ set CACHE_VER = {
 	'js/lottery.js': 256,
 	'js/marked.js': 280,
 	'js/submit.js': 265,
-	'js/userpage.js': 241,
+	'js/userpage.js': 242,
 	'js/userpage_v.js': 245,
 	'js/lozad.js': 260,
 
diff --git a/files/templates/votes.html b/files/templates/votes.html
index af9112f6e..eb4ad9c75 100644
--- a/files/templates/votes.html
+++ b/files/templates/votes.html
@@ -9,8 +9,6 @@
 
 {% if thing %}
 
-<script src="/assets/js/sort_table.js?v=243"></script>
-
 <pre>
 	
 </pre>
@@ -82,6 +80,9 @@
 		{% endfor %}
 	</table>
 </div>
+
+<script src="/assets/js/sort_table.js?v=243"></script>
+
 {% endif %}