Merge branch 'frost' into ezra

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: Aevann1
-custom: ["https://marsey1.gumroad.com/l/tfcvri"]
+custom: ["https://marsey1.gumroad.com/l/tfcvri"]

files/helpers/const.py

@@ -19,6 +19,8 @@ for k, val in result.items():
 
 del result
 
+marseys = dict(sorted(marseys.items(), key=lambda x: x[1]))
+
 if SITE == 'rdrama.net':
 	topmakers = {}
 	for k, val in marseys.items():

files/routes/admin.py

@@ -27,15 +27,32 @@ if SITE_NAME == 'PCM': cc = "splash mountain"
 else: cc = "country club"
 month = datetime.now().strftime('%B')
 
+@app.post("/@<username>/make_admin")
+@limiter.limit("1/second")
+@admin_level_required(3)
+@validate_formkey
+def make_admin(v, username):
+	if request.host == 'rdrama.net': abort(403)
+	user = get_user(username)
+	if not user: abort(404)
+	user.admin_level = 2
+	g.db.add(user)
+	g.db.commit()
+	return {"message": "User has been made admin!"}
 
-@app.get("/admin/grassed")
-@admin_level_required(2)
-def grassed(v):
-	users = g.db.query(User).filter(User.ban_reason.like('grass award used by @%')).all()
 
-	if not v or v.oldsite: template = ''
-	else: template = 'CHRISTMAS/'
-	return render_template(f"{template}grassed.html", v=v, users=users)
+@app.post("/@<username>/remove_admin")
+@limiter.limit("1/second")
+@admin_level_required(3)
+@validate_formkey
+def remove_admin(v, username):
+	if request.host == 'rdrama.net': abort(403)
+	user = get_user(username)
+	if not user: abort(404)
+	user.admin_level = 0
+	g.db.add(user)
+	g.db.commit()
+	return {"message": "Admin removed!"}
 
 @app.post("/distribute/<comment>")
 @limiter.limit("1/second")
@@ -255,20 +272,11 @@ def post_sidebar(v):
 @auth_required
 def shadowbanned(v):
 	if not (v and v.admin_level > 1): abort(404)
-	users = [x for x in g.db.query(User).filter(User.shadowbanned != None).all()]
+	users = [x for x in g.db.query(User).filter(User.shadowbanned != None).order_by(User.shadowbanned).all()]
 	if not v or v.oldsite: template = ''
 	else: template = 'CHRISTMAS/'
 	return render_template(f"{template}shadowbanned.html", v=v, users=users)
 
-@app.get("/admin/agendaposters")
-@auth_required
-def agendaposters(v):
-	if not (v and v.admin_level > 1): abort(404)
-	users = [x for x in g.db.query(User).filter_by(agendaposter = True).all()]
-	if not v or v.oldsite: template = ''
-	else: template = 'CHRISTMAS/'
-	return render_template(f"{template}agendaposters.html", v=v, users=users)
-
 
 @app.get("/admin/image_posts")
 @admin_level_required(2)
@@ -404,8 +412,9 @@ def badge_grant_post(v):
 
 	g.db.add(new_badge)
 	
-	text = f"@{v.username} has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}"
-	send_notification(user.id, text)	
+	if v.id != user.id:
+		text = f"@{v.username} has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}"
+		send_notification(user.id, text)
 	
 	g.db.commit()
 	return render_template(f"{template}admin/badge_grant.html", v=v, badge_types=BADGES, msg="Badge granted!")

files/routes/awards.py

@@ -213,12 +213,11 @@ def award_post(pid, v):
 	post_award.submission_id = post.id
 	g.db.add(post_award)
 
-	msg = f"@{v.username} has given your [post]({post.permalink}) the {AWARDS[kind]['title']} Award!"
-
-	note = request.values.get("note", "").strip()
-	if note: msg += f"\n\n> {note}"
-
-	send_repeatable_notification(post.author.id, msg)
+	if v.id != post.author.id:
+		msg = f"@{v.username} has given your [post]({post.permalink}) the {AWARDS[kind]['title']} Award!"
+		note = request.values.get("note", "").strip()
+		if note: msg += f"\n\n> {note}"
+		send_repeatable_notification(post.author.id, msg)
 
 	author = post.author
 	if kind == "ban":
@@ -379,12 +378,12 @@ def award_comment(cid, v):
 	comment_award.comment_id = c.id
 	g.db.add(comment_award)
 
-	msg = f"@{v.username} has given your [comment]({c.permalink}) the {AWARDS[kind]['title']} Award!"
+	if v.id != c.author.id:
+		msg = f"@{v.username} has given your [comment]({c.permalink}) the {AWARDS[kind]['title']} Award!"
+		note = request.values.get("note", "").strip()
+		if note: msg += f"\n\n> {note}"
+		send_repeatable_notification(c.author.id, msg)
 
-	note = request.values.get("note", "").strip()
-	if note: msg += f"\n\n> {note}"
-
-	send_repeatable_notification(c.author.id, msg)
 	author = c.author
 
 	if kind == "ban":
@@ -554,12 +553,11 @@ def admin_userawards_post(v):
 
 				g.db.add(award)
 
-	text = "You were given the following awards:\n\n"
-	
-	for key, value in notify_awards.items():
-		text += f" - **{value}** {AWARDS[key]['title']} {'Awards' if value != 1 else 'Award'}\n"
-
-	send_repeatable_notification(u.id, text)
+	if v.id != u.id:
+		text = "You were given the following awards:\n\n"
+		for key, value in notify_awards.items():
+			text += f" - **{value}** {AWARDS[key]['title']} {'Awards' if value != 1 else 'Award'}\n"
+		send_repeatable_notification(u.id, text)
 
 	note = ""
 

files/routes/login.py

@@ -171,7 +171,7 @@ def logout(v):
 @auth_desired
 def sign_up_get(v):
 	with open('disablesignups', 'r') as f:
-		if f.read() == "yes": return {"error","New account registration is currently closed. Please come back later."}, 403
+		if f.read() == "yes": return {"error": "New account registration is currently closed. Please come back later."}, 403
 
 	if v: return redirect("/")
 
@@ -186,9 +186,7 @@ def sign_up_get(v):
 		ref_user = None
 
 	if ref_user and (ref_user.id in session.get("history", [])):
-		if not v or v.oldsite: template = ''
-		else: template = 'CHRISTMAS/'
-		return render_template(f"{template}sign_up_failed_ref.html")
+		return render_template("sign_up_failed_ref.html")
 
 	now = int(time.time())
 	token = token_hex(16)
@@ -203,9 +201,7 @@ def sign_up_get(v):
 
 	redir = request.values.get("redirect", "/").replace("/logged_out", "").strip()
 
-	if not v or v.oldsite: template = ''
-	else: template = 'CHRISTMAS/'
-	return render_template(f"{template}sign_up.html",
+	return render_template("sign_up.html",
 						   formkey=formkey,
 						   now=now,
 						   redirect=redir,
@@ -220,7 +216,7 @@ def sign_up_get(v):
 @auth_desired
 def sign_up_post(v):
 	with open('disablesignups', 'r') as f:
-		if f.read() == "yes": return {"error","New account registration is currently closed. Please come back later."}, 403
+		if f.read() == "yes": return {"error": "New account registration is currently closed. Please come back later."}, 403
 
 	if v: abort(403)
 
@@ -389,8 +385,6 @@ def get_reset():
 
 	user_id = request.values.get("id")
 
-	if user_id == PW_ID: abort(403)
-
 	timestamp = int(request.values.get("time",0))
 	token = request.values.get("token")
 
@@ -426,8 +420,6 @@ def post_reset(v):
 
 	user_id = request.values.get("user_id")
 
-	if user_id == PW_ID: abort(403)
-
 	timestamp = int(request.values.get("time"))
 	token = request.values.get("token")
 

files/routes/settings.py

@@ -580,8 +580,6 @@ def verifiedcolor(v):
 @validate_formkey
 def settings_security_post(v):
 	if request.values.get("new_password"):
-		if v.id == PW_ID: abort(403)
-
 		if request.values.get("new_password") != request.values.get("cnf_password"):
 			return render_template("settings_security.html", v=v, error="Passwords do not match.")
 
@@ -633,8 +631,6 @@ def settings_security_post(v):
 		return render_template("settings_security.html", v=v, error="Check your email and click the verification link to complete the email change.")
 
 	if request.values.get("2fa_token"):
-		if v.id == PW_ID: abort(403)
-
 		if not v.verifyPass(request.values.get('password')):
 			return render_template("settings_security.html", v=v, error="Invalid password or token.")
 

files/routes/static.py

@@ -41,7 +41,8 @@ def participation_stats(v):
 
 	day = now - 86400
 
-	data = {"valid_users": g.db.query(User.id).count(),
+	data = {"marseys": len(marseys),
+			"users": g.db.query(User.id).count(),
 			"private_users": g.db.query(User.id).filter_by(is_private=True).count(),
 			"banned_users": g.db.query(User.id).filter(User.is_banned > 0).count(),
 			"verified_email_users": g.db.query(User.id).filter_by(is_activated=True).count(),
@@ -102,10 +103,10 @@ def cached_chart(days):
 
 	if days > 31:
 		file = "/weekly_chart.png"
-		day_cutoffs = [today_cutoff - 86400 * 7 * i for i in range(31)][1:]
+		day_cutoffs = [today_cutoff - 86400 * 7 * i for i in range(35)][1:]
 	else:
 		file = "/daily_chart.png"
-		day_cutoffs = [today_cutoff - 86400 * i for i in range(31)][1:]
+		day_cutoffs = [today_cutoff - 86400 * i for i in range(35)][1:]
 
 	day_cutoffs.insert(0, calendar.timegm(now))
 

files/routes/users.py

@@ -18,6 +18,25 @@ site = environ.get("DOMAIN").strip()
 beams_client = PushNotifications(instance_id=PUSHER_INSTANCE_ID, secret_key=PUSHER_KEY)
 
 
+
+@app.get("/grassed")
+@auth_desired
+def grassed(v):
+	users = g.db.query(User).filter(User.ban_reason.like('grass award used by @%')).all()
+
+	if not v or v.oldsite: template = ''
+	else: template = 'CHRISTMAS/'
+	return render_template(f"{template}grassed.html", v=v, users=users)
+
+@app.get("/agendaposters")
+@auth_desired
+def agendaposters(v):
+	users = [x for x in g.db.query(User).filter_by(agendaposter = True).order_by(User.username).all()]
+	if not v or v.oldsite: template = ''
+	else: template = 'CHRISTMAS/'
+	return render_template(f"{template}agendaposters.html", v=v, users=users)
+
+
 @app.get("/@<username>/upvoters")
 @auth_desired
 def upvoters(v, username):
@@ -107,7 +126,7 @@ def downvoting(v, username):
 @auth_required
 @validate_formkey
 def pay_rent(v):
-	if v.coins < 500: return {"error","You must have more than 500 coins."}
+	if v.coins < 500: return {"error":"You must have more than 500 coins."}
 	v.coins -= 500
 	v.rent_utc = int(time.time())
 	g.db.add(v)

files/templates/admin/admin_home.html

@@ -23,8 +23,9 @@
 <ul>
 	<li><a href="/admin/users">Users Feed</a></li>
 	<li><a href="/admin/shadowbanned">Shadowbanned Users</a></li>
-	<li><a href="/admin/agendaposters">Users with Agendaposter Theme</a></li>
-	<li><a href="/admin/grassed">Currently Grassed Users</a></li>
+	<li><a href="/banned">Permabanned Users</a></li>
+	<li><a href="/agendaposters">Users with Agendaposter Theme</a></li>
+	<li><a href="/grassed">Currently Grassed Users</a></li>
 </ul>
 
 <h4>Safety</h4>

files/templates/admins.html

@@ -3,22 +3,26 @@
 {% block pagetitle %}Admins{% endblock %}
 
 {% block content %}
+
+<script src="/static/assets/js/sort_table.js?a=5"></script>
+
 <pre class="d-none d-md-inline-block"></pre>
 <h5 style="font-weight:bold;">Admins</h5>
 <pre></pre>
-<div class="overflow-x-auto"><table class="table table-striped mb-5">
+<div class="overflow-x-auto">
+<table id="sortable_table" class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
 		<th style="font-weight:bold;">#</th>
 		<th style="font-weight:bold;">Name</th>
-		<th style="font-weight:bold; text-align:right;">Truescore</th>
-		<th style="font-weight:bold; text-align:right;">Mod actions</th>
+		<th role="button" onclick="sort_table(2)" style="font-weight:bold; text-align:right;">Truescore</th>
+		<th role="button" onclick="sort_table(3)" style="font-weight:bold; text-align:right;">Mod actions</th>
 	</tr>
 </thead>
 {% for user in admins %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a>{% if user.admin_level == 1 and v and v.admin_level > 1 %}<i class="fas fa-broom align-middle ml-2 color-white" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Meme Admin"></i>{% endif %}</td>
+		<td><a style="color:#{{user.namecolor}};font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a>{% if user.admin_level == 1 and v and v.admin_level > 1 %}<i class="fas fa-broom align-middle ml-2 color-white" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Meme Admin"></i>{% endif %}</td>
 		<td style="font-weight:bold; text-align:right;">{{user.truecoins}}</td>
 		<td style="font-weight:bold; text-align:right;">{{user.modaction_num}}</td>
 	</tr>

files/templates/agendaposters.html

@@ -11,7 +11,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>

files/templates/authforms.html

@@ -15,7 +15,7 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
 			{% if v.agendaposter %}
 				<style>
 					html {
@@ -39,7 +39,7 @@
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 		{% endif %}
 
 </head>

files/templates/banned.html

@@ -13,9 +13,9 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold;">{% if user.ban_reason %}{{user.ban_reason}}{% endif %}</td>
-		<td style="font-weight:bold;" href="/@{{user.banned_by.username}}"><img alt="@{{user.banned_by.username}}'s profile picture" loading="lazy" src="/uid/{{user.banned_by.id}}/pic" class="pp20"><span {% if user.banned_by.patron %}class="patron" style="background-color:#{{user.banned_by.namecolor}};"{% endif %}>{{user.banned_by.username}}</span></a></td>
+		<td style="font-weight:bold;" href="/@{{user.banned_by.username}}"><img alt="@{{user.banned_by.username}}'s profile picture" loading="lazy" src="/uid/{{user.banned_by.id}}/pic" class="pp20"><span {% if user.banned_by.patron %}class="patron" style="background-color:#{{user.banned_by.namecolor}}"{% endif %}>{{user.banned_by.username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>

files/templates/blocks.html

@@ -8,14 +8,16 @@
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
+		<th style="font-weight: bold">#</th>
 		<th style="font-weight:bold;">User</th>
 		<th style="font-weight:bold;">Target</th>
 	</tr>
 </thead>
 {% for user in users %}
 	<tr>
-		<td><a style="font-weight:bold;color:#{{user.namecolor}}; " href="/@{{user.username}}"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
-		<td><a style="font-weight:bold;color:#{{targets[loop.index-1].namecolor}}; " href="/@{{targets[loop.index-1].username}}"><span {% if targets[loop.index-1].patron %}class="patron" style="background-color:#{{targets[loop.index-1].namecolor}};"{% endif %}>{{targets[loop.index-1].username}}</span></a></td>
+		<td style="font-weight: bold">{{loop.index}}</td>
+		<td><a style="font-weight:bold;color:#{{user.namecolor}}; " href="/@{{user.username}}"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="font-weight:bold;color:#{{targets[loop.index-1].namecolor}}; " href="/@{{targets[loop.index-1].username}}"><span {% if targets[loop.index-1].patron %}class="patron" style="background-color:#{{targets[loop.index-1].namecolor}}"{% endif %}>{{targets[loop.index-1].username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>

files/templates/comments.html

@@ -857,7 +857,7 @@
 
 {% include "expanded_image_modal.html" %}
 
-<script src="/static/assets/js/comments+submission_listing.js?a=6"></script>
+<script src="/static/assets/js/comments+submission_listing.js?a=9"></script>
 <script src="/static/assets/js/comments.js?a=4"></script>
 
 <script>

files/templates/default.html

@@ -7,7 +7,7 @@
 	<script src="/static/assets/js/bootstrap.js?a=3"></script>
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=59">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=63">
 		<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
 		{% if v.agendaposter %}
 			<style>
@@ -32,7 +32,7 @@
 		{% endif %}
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	{% endif %}
 
 	<meta charset="utf-8">

files/templates/emoji_modal.html

@@ -80,7 +80,7 @@
 	</div>
 </div>
 
-<script src="/static/assets/js/emoji_modal.js?a=17"></script>
+<script src="/static/assets/js/emoji_modal.js?a=19"></script>
 
 <style>
 	a.emojitab {

files/templates/followers.html

@@ -21,7 +21,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight: bold">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		{% if v.id == u.id %}
 		<td><div class="btn btn-danger pr-2" onclick="removeFollower(event, '{{user.username}}')">Remove follow</div></td>
 		{% endif %}

files/templates/following.html

@@ -21,7 +21,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight: bold">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		{% if v.id == u.id %}
 		<td><div class="btn btn-danger" onclick="removeFollowing(event, '{{user.username}}')">Unfollow</div></td>
 		{% endif %}

files/templates/grassed.html

@@ -1,7 +1,8 @@
 {% extends "settings2.html" %}
 
 {% block content %}
-<div class="overflow-x-auto"><table class="table table-striped mb-5">
+<div class="overflow-x-auto">
+<table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
 		<th style="font-weight:bold;">#</th>
@@ -12,7 +13,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold;">{{user.ban_reason.split('by ')[1]}}</td>
 	</tr>
 {% endfor %}

files/templates/header.html

@@ -94,7 +94,7 @@
 						<div class="d-flex">
 							<div><img alt="your profile picture" loading="lazy" src="{{v.profile_url}}" class="profile-pic-35"></div>
 							<div class="text-left pl-2">
-								<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}};"{% endif %}>{{v.username}}</span></div>
+								<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}}"{% endif %}>{{v.username}}</span></div>
 								<div class="text-small-extra text-primary"><img alt="{{'COINS_NAME' | app_config}}" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/static/assets/images/emojis/marseycoin.webp" data-bs-original-title="{{'COINS_NAME' | app_config}}" aria-label="{{'COINS_NAME' | app_config}}"><span id="user-coins-amount">{{v.coins}}</span> {{'COINS_NAME' | app_config}}</div>
 								<div class="text-small-extra text-primary"><img alt="marseybux" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/static/assets/images/emojis/marseybux.webp" data-bs-original-title="Marseybux" aria-label="Marseybux"><span id="user-bux-amount">{{v.procoins}}</span> Marseybux</div>
 							</div>

files/templates/home.html

@@ -99,7 +99,7 @@
 	<div class="col">
 		<div class="card pseudo-submit-form border">
 			<div class="card-header bg-gray-100">
-				<div class="mb-0">SUBMIT DRAMA!</div>
+				<div class="mb-0">{% if request.host == 'rdrama.net' %}SUBMIT DRAMA!{% else %}CREATE A POST{% endif %}</div>
 				<ul class="list-inline no-bullets mb-0 d-none">
 					<li class="list-inline-item active mr-4"><i class="fas fa-align-left text-gray-400"></i></li>
 					<li class="list-inline-item"><i class="fas fa-link text-gray-400"></i></li>

files/templates/leaderboard.html

@@ -17,7 +17,7 @@
 {% for user in users1 %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.coins}}</td>
 	</tr>
 {% endfor %}
@@ -45,7 +45,7 @@
 {% for user in users7 %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.coins_spent}}</td>
 	</tr>
 {% endfor %}
@@ -73,7 +73,7 @@
 	{% for user in users10 %}
 		<tr>
 			<td style="font-weight:bold;">{{loop.index}}</td>
-			<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+			<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 			<td style="font-weight:bold; text-align:right;">{{user.truecoins}}</td>
 		</tr>
 	{% endfor %}
@@ -100,7 +100,7 @@
 {% for user in users2 %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.stored_subscriber_count}}</td>
 	</tr>
 {% endfor %}
@@ -125,7 +125,7 @@
 {% for user in users3 %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.post_count}}</td>
 	</tr>
 {% endfor %}
@@ -150,7 +150,7 @@
 {% for user in users4 %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.comment_count}}</td>
 	</tr>
 {% endfor %}
@@ -177,7 +177,7 @@
 {% for user in users5 %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.received_award_count}}</td>
 	</tr>
 {% endfor %}
@@ -206,7 +206,7 @@
 	{% for user in users9 %}
 		<tr>
 			<td style="font-weight: bold">{{loop.index}}</td>
-			<td><a style="color:#{{user[0].namecolor}};  font-weight:bold;" href="/@{{user[0].username}}"><img alt="@{{user[0].username}}'s profile picture" loading="lazy" src="/uid/{{user[0].id}}/pic" class="pp20"><span {% if user[0].patron %}class="patron" style="background-color:#{{user[0].namecolor}};"{% endif %}>{{user[0].username}}</span></a></td>
+			<td><a style="color:#{{user[0].namecolor}};  font-weight:bold;" href="/@{{user[0].username}}"><img alt="@{{user[0].username}}'s profile picture" loading="lazy" src="/uid/{{user[0].id}}/pic" class="pp20"><span {% if user[0].patron %}class="patron" style="background-color:#{{user[0].namecolor}}"{% endif %}>{{user[0].username}}</span></a></td>
 			<td style="font-weight: bold">{{user[1]}}</td>
 		</tr>
 	{% endfor %}
@@ -236,7 +236,7 @@
 	{% for user in users12 %}
 		<tr>
 			<td style="font-weight: bold">{{loop.index}}</td>
-			<td><a style="color:#{{user[0].namecolor}};  font-weight:bold;" href="/@{{user[0].username}}"><img alt="@{{user[0].username}}'s profile picture" loading="lazy" src="/uid/{{user[0].id}}/pic" class="pp20"><span {% if user[0].patron %}class="patron" style="background-color:#{{user[0].namecolor}};"{% endif %}>{{user[0].username}}</span></a></td>
+			<td><a style="color:#{{user[0].namecolor}};  font-weight:bold;" href="/@{{user[0].username}}"><img alt="@{{user[0].username}}'s profile picture" loading="lazy" src="/uid/{{user[0].id}}/pic" class="pp20"><span {% if user[0].patron %}class="patron" style="background-color:#{{user[0].namecolor}}"{% endif %}>{{user[0].username}}</span></a></td>
 			<td style="font-weight: bold">{{user[1]}}</td>
 		</tr>
 	{% endfor %}
@@ -266,7 +266,7 @@
 	{% for user in users6 %}
 		<tr>
 			<td style="font-weight:bold;">{{loop.index}}</td>
-			<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+			<td><a style="color:#{{user.namecolor}};  font-weight:bold; fonts" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 			<td style="font-weight:bold; text-align:right;">{{user.basedcount}}</td>
 		</tr>
 	{% endfor %}

files/templates/log.html

@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
 	{% if v.agendaposter %}
 		<style>
 			html {
@@ -30,7 +30,7 @@
 	{% endif %}
 {% else %}
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 {% endif %}
 
 <div class="row justify-content-around">

files/templates/login.html

@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=59">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=63">
 	<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>

files/templates/login_2fa.html

@@ -14,7 +14,7 @@
 		<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 

files/templates/patrons.html

@@ -12,7 +12,7 @@
 {% for u in users %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{u.namecolor}};  font-weight:bold;" href="/@{{u.username}}"><img alt="@{{u.username}}'s profile picture" loading="lazy" src="{{u.profile_url}}" class="pp20"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></a></td>
+		<td><a style="color:#{{u.namecolor}};  font-weight:bold;" href="/@{{u.username}}"><img alt="@{{u.username}}'s profile picture" loading="lazy" src="{{u.profile_url}}" class="pp20"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span></a></td>
 
 		<td><img alt="Patron-{{u.patron}}" loading="lazy" width=32 height=32 src="/static/assets/images/badges/Patron-{{u.patron}}.webp?a=3"></td>
 	</tr>

files/templates/rentoids.html

@@ -13,7 +13,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight: bold">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>

files/templates/settings.html

@@ -34,7 +34,7 @@
 
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
 	{% if v.agendaposter %}
 		<style>
 			html {

files/templates/settings2.html

@@ -39,10 +39,10 @@
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	{% endif %}
 </head>
 

files/templates/shadowbanned.html

@@ -1,7 +1,9 @@
 {% extends "settings2.html" %}
 
 {% block content %}
-<div class="overflow-x-auto"><table class="table table-striped mb-5">
+
+<div class="overflow-x-auto">
+<table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
 		<th style="font-weight:bold;">#</th>
@@ -12,7 +14,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 		<td style="font-weight:bold;">{{user.shadowbanned}}</td>
 	</tr>
 {% endfor %}

files/templates/sign_up.html

@@ -31,7 +31,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 

files/templates/sign_up_failed_ref.html

@@ -32,7 +32,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 

files/templates/submission_listing.html

@@ -698,5 +698,5 @@
 </style>
 
 <script src="/static/assets/js/clipboard.js?a=3"></script>
-<script src="/static/assets/js/comments+submission_listing.js?a=6"></script>
+<script src="/static/assets/js/comments+submission_listing.js?a=9"></script>
 <script src="/static/assets/js/submission_listing.js?a=3"></script>

files/templates/submit.html

@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=59"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=63"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=9">
 			{% if v.agendaposter %}
 				<style>
 					html {
@@ -50,7 +50,7 @@
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=59">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=63">
 			<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 		{% endif %}
 		{% endblock %}

files/templates/thiefs.html

@@ -13,7 +13,7 @@
 {% for user in successful %}
 	<tr>
 		<td style="font-weight: bold">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>
@@ -31,7 +31,7 @@
 {% for user in failed2 %}
 	<tr>
 		<td style="font-weight: bold">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>
@@ -49,7 +49,7 @@
 {% for user in failed %}
 	<tr>
 		<td style="font-weight: bold">{{loop.index}}</td>
-		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}};"{% endif %}>{{user.username}}</span></a></td>
+		<td><a style="color:#{{user.namecolor}};  font-weight:bold;" href="/@{{user.username}}"><img alt="@{{user.username}}'s profile picture" loading="lazy" src="/uid/{{user.id}}/pic" class="pp20"><span {% if user.patron %}class="patron" style="background-color:#{{user.namecolor}}"{% endif %}>{{user.username}}</span></a></td>
 	</tr>
 {% endfor %}
 </table>

files/templates/userpage.html

@@ -53,7 +53,7 @@
 								{% if u.unban_utc %}<h5 style="color:#ff66ac;">{{u.unban_string}}</h5>{% endif %}
 							{% endif %}
 							<div class="d-flex align-items-center mt-1 mb-2">
-								<h1 class="font-weight-bolder h3 mb-0" style="color: #{{u.namecolor}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></h1>
+								<h1 class="font-weight-bolder h3 mb-0" style="color: #{{u.namecolor}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span></h1>
 								{% if u.username != u.original_username %}
 								<span>
 									<i class="fad fa-user-tag text-info align-middle ml-2" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Original Username: @{{u.original_username}}"></i>
@@ -352,7 +352,7 @@
 					{% if u.unban_utc %}<h5 style="color:#ff66ac;">{{u.unban_string}}</h5>{% endif %}
 				{% endif %}
 				{% if u.verified %}<span><i class="fas fa-badge-check align-middle ml-1" style="color:{% if u.verifiedcolor %}#{{u.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{u.verified}}"></i></span>&nbsp;{% endif %}
-				<a class="text-black"><h1 class="h5 d-inline-block" style="color: #{{u.namecolor}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></h1></a>
+				<a class="text-black"><h1 class="h5 d-inline-block" style="color: #{{u.namecolor}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span></h1></a>
 				{% if u.username != u.original_username %}
 					<span>
 						<i class="fad fa-user-tag text-info align-middle ml-2" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Original Username: @{{u.original_username}}"></i>

files/templates/userpage_blocked.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block title %}
-<title><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></title>
+<title><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span></title>
 
 {% endblock %}
 

files/templates/userpage_blocking.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block title %}
-<title><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span></title>
+<title><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span></title>
 
 {% endblock %}
 

files/templates/viewers.html

@@ -12,7 +12,7 @@
 </thead>
 {% for view in viewers %}
 	<tr>
-		<td style="font-weight: bold"><a style="color: #{{view.viewer.namecolor}}" href="/@{{view.viewer.username}}"><img alt="@{{view.viewer.username}}'s profile picture" loading="lazy" src="/uid/{{view.viewer.id}}/pic" class="pp20"><span {% if view.viewer.patron %}class="patron" style="background-color:#{{view.viewer.namecolor}};"{% endif %}>{{view.viewer.username}}</span></a></td>
+		<td style="font-weight: bold"><a style="color: #{{view.viewer.namecolor}}" href="/@{{view.viewer.username}}"><img alt="@{{view.viewer.username}}'s profile picture" loading="lazy" src="/uid/{{view.viewer.id}}/pic" class="pp20"><span {% if view.viewer.patron %}class="patron" style="background-color:#{{view.viewer.namecolor}}"{% endif %}>{{view.viewer.username}}</span></a></td>
 		<td style="font-weight: bold">{{view.last_view_string}}</td>
 	</tr>
 {% endfor %}

files/templates/voters.html

@@ -18,7 +18,7 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight: bold">{{loop.index}}</td>
-		<td><a style="color:#{{user[0].namecolor}};  font-weight:bold;" href="/@{{user[0].username}}"><img alt="@{{user[0].username}}'s profile picture" loading="lazy" src="/uid/{{user[0].id}}/pic" class="pp20"><span {% if user[0].patron %}class="patron" style="background-color:#{{user[0].namecolor}};"{% endif %}>{{user[0].username}}</span></a></td>
+		<td><a style="color:#{{user[0].namecolor}};  font-weight:bold;" href="/@{{user[0].username}}"><img alt="@{{user[0].username}}'s profile picture" loading="lazy" src="/uid/{{user[0].id}}/pic" class="pp20"><span {% if user[0].patron %}class="patron" style="background-color:#{{user[0].namecolor}}"{% endif %}>{{user[0].username}}</span></a></td>
 		<td style="font-weight: bold">{{user[1]}}</td>
 	</tr>
 {% endfor %}

files/templates/votes.html

@@ -23,7 +23,7 @@
 	<thead class="bg-primary text-white"><tr><th>User</th></tr></thead>
 
 	{% for vote in ups %}
-		<tr><td><a style="color:#{{vote.user.namecolor}};font-weight:bold" href="/@{{vote.user.username}}"><img alt="@{{vote.user.username}}'s profile picture" loading="lazy" src="/uid/{{vote.user.id}}/pic" class="pp20"><span {% if vote.user.patron %}class="patron" style="background-color:#{{vote.user.namecolor}};"{% endif %}>{{vote.user.username}}</span></a></td></tr>
+		<tr><td><a style="color:#{{vote.user.namecolor}};font-weight:bold" href="/@{{vote.user.username}}"><img alt="@{{vote.user.username}}'s profile picture" loading="lazy" src="/uid/{{vote.user.id}}/pic" class="pp20"><span {% if vote.user.patron %}class="patron" style="background-color:#{{vote.user.namecolor}}"{% endif %}>{{vote.user.username}}</span></a></td></tr>
 	{% endfor %}
 </table>
 
@@ -32,7 +32,7 @@
 	<thead class="bg-primary text-white"><tr><th>User</th></tr></thead>
 
 	{% for vote in downs %}
-		<tr><td><a style="color:#{{vote.user.namecolor}};  font-weight:bold;" href="/@{{vote.user.username}}"><img alt="@{{vote.user.username}}'s profile picture" loading="lazy" src="/uid/{{vote.user.id}}/pic" class="pp20"><span {% if vote.user.patron %}class="patron" style="background-color:#{{vote.user.namecolor}};"{% endif %}>{{vote.user.username}}</span></a></td></tr>
+		<tr><td><a style="color:#{{vote.user.namecolor}};  font-weight:bold;" href="/@{{vote.user.username}}"><img alt="@{{vote.user.username}}'s profile picture" loading="lazy" src="/uid/{{vote.user.id}}/pic" class="pp20"><span {% if vote.user.patron %}class="patron" style="background-color:#{{vote.user.namecolor}}"{% endif %}>{{vote.user.username}}</span></a></td></tr>
 	{% endfor %}
 </table>