From 9e9f1252008d4bc28faf8100b2e4c1d67a43fd3b Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 14 Jan 2022 12:22:37 +0200
Subject: [PATCH] bbb

---
 files/templates/admin/sidebar.html      |  2 +-
 files/templates/comments.html           |  8 ++++----
 files/templates/sidebar_Drama.html      |  6 +-----
 files/templates/sidebar_PCM.html        |  3 ++-
 files/templates/sign_up.html            |  2 +-
 files/templates/submission.html         | 16 ++++++++--------
 files/templates/submission_listing.html |  8 ++++----
 files/templates/userpage.html           |  4 ++--
 8 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/files/templates/admin/sidebar.html b/files/templates/admin/sidebar.html
index 21f7c22b2e..ce8e66fcd9 100644
--- a/files/templates/admin/sidebar.html
+++ b/files/templates/admin/sidebar.html
@@ -27,7 +27,7 @@
 				<div class="w-lg-100">
 					<form id="profile-settings" action="/admin/sidebar" method="post">
 						<input autocomplete="off" type="hidden" name="formkey" value="{{v.formkey}}">
-						<textarea autocomplete="off" maxlength="10000" class="form-control rounded" id="bio-text" aria-label="With textarea" placeholder="Site sidebar" rows="50" name="sidebar" form="profile-settings">{% if sidebar %}{{ sidebar }}{% endif %}</textarea>
+						<textarea autocomplete="off" maxlength="10000" class="form-control rounded" id="bio-text" aria-label="With textarea" placeholder="Site sidebar" rows="50" name="sidebar" form="profile-settings">{% if sidebar %}{{sidebar}}{% endif %}</textarea>
 
 						<div class="d-flex mt-2">
 							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Save">
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 9018f7db06..0b6337d02e 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -219,7 +219,7 @@
 				<a class="user-name text-decoration-none" onclick='popclick({{c.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover" role="button" tabindex="0" style="color:#{{c.author.namecolor}}; font-size:12px; font-weight:bold;"><img alt="@{{c.author.username}}'s profile picture" loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.namecolor}};"{% elif c.distinguish_level and request.host == 'rdrama.net' %}class="mod"{% endif %}>{{c.author.username}}</span></a>
 				{% if c.author.customtitle %}&nbsp;<bdi style="color: #{{c.author.titlecolor}}">&nbsp;{% if c.author.quadrant %}<img alt="{{c.author.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{c.author.quadrant}}.webp?a=3">{% endif %}{{c.author.customtitle | safe}}</bdi>{% endif %}
 
-				{% if c.parent_comment_id and not standalone and level != 1 %}<a href="#comment-{{ c.parent_comment_id }}-only" class="text-muted ml-2"><i class="fas fa-reply fa-sm fa-fw fa-flip-horizontal mr-1"></i>{{ c.parent_comment.author.username }}</a>{% endif %}
+				{% if c.parent_comment_id and not standalone and level != 1 %}<a href="#comment-{{c.parent_comment_id}}-only" class="text-muted ml-2"><i class="fas fa-reply fa-sm fa-fw fa-flip-horizontal mr-1"></i>{{c.parent_comment.author.username}}</a>{% endif %}
 
 				{% if c.created_utc %}
 					<span id="timestamp-{{c.id}}" onmouseover="timestamp('timestamp-{{c.id}}','{{c.created_utc}}')" data-bs-toggle="tooltip" data-bs-placement="bottom" class="time-stamp">&nbsp;{{c.age_string}}</span>
@@ -235,7 +235,7 @@
 				<pre></pre>
 				<ul style="padding-left:20px; margin-bottom: 0;">
 					{% for f in c.flags %}
-						<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/c{{ f.id }}')">[remove]</a>{% endif %}</li>
+						<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/c{{f.id}}')">[remove]</a>{% endif %}</li>
 					{% endfor %}
 				</ul>
 			</div>
@@ -472,7 +472,7 @@
 						
 						{% if v and v.admin_level > 1 and v.id != c.author_id %}
 							<button id="unban-{{c.id}}" class="btn caction py-0 nobackground px-1 d-none {% if c.author.is_suspended %}d-md-inline-block{% endif %} text-success" id="unexile-comment-{{c.id}}" onclick="post_toast3('/unban_user/{{c.author_id}}','ban-{{c.id}}','unban-{{c.id}}')"><i class="fas fa-user-slash text-success fa-fw"></i>Unban user</button>
-							<button id="ban-{{c.id}}" class="btn caction py-0 nobackground px-1 d-none {% if not c.author.is_suspended %}d-md-inline-block{% endif %} text-danger" id="exile-comment-{{c.id}}" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/comment/{{c.id}}', '{{ c.author.id }}', '{{c.author.username}}')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</button>
+							<button id="ban-{{c.id}}" class="btn caction py-0 nobackground px-1 d-none {% if not c.author.is_suspended %}d-md-inline-block{% endif %} text-danger" id="exile-comment-{{c.id}}" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/comment/{{c.id}}', '{{c.author.id}}', '{{c.author.username}}')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</button>
 						{% endif %}
 						
 						{% if v and v.admin_level > 1 and c.oauth_app %}
@@ -647,7 +647,7 @@
 						{% endif %}
 
 						{% if v.id != c.author_id %}
-							<a id="ban2-{{c.id}}" class="{% if c.author.is_suspended %}d-none{% endif %} list-group-item text-danger" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/comment/{{c.id}}', '{{ c.author.id }}', '{{c.author.username}}')" role="button"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
+							<a id="ban2-{{c.id}}" class="{% if c.author.is_suspended %}d-none{% endif %} list-group-item text-danger" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/comment/{{c.id}}', '{{c.author.id}}', '{{c.author.username}}')" role="button"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
 							<a id="unban2-{{c.id}}" class="{% if not c.author.is_suspended %}d-none{% endif %} list-group-item text-success" role="button" onclick="post_toast2('/unban_user/{{c.author_id}}','ban2-{{c.id}}','unban2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-user-minus fa-fw text-success"></i>Unban user</a>
 						{% endif %}
 
diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html
index 033d5656a4..ba34dc7ca6 100644
--- a/files/templates/sidebar_Drama.html
+++ b/files/templates/sidebar_Drama.html
@@ -1,10 +1,6 @@
 <div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
 
-    {% set image = "/static/assets/images/" + SITE_NAME + "/banners/" + range(1,num_banners)|random()|string + ".webp?a=8" %}
-
-    <a role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{image}}" onclick="expandDesktopImage('{{image}}')">
-        <img loading="lazy" src="{{image}}" width=100%>
-    </a>
+    <img role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage(this.src)" loading="lazy" src="/static/assets/images/{{SITE_NAME}}/banners/{{range(1,num_banners)|random()}}.webp?a=8" width=100%>
 
     <a class="btn btn-primary btn-block mt-4" href="/post/16583">EMOJI MEGATHREAD</a>
     <a class="btn btn-primary btn-block" href="/post/18459">BUGS/SUGGESTIONS MEGATHREAD</a>
diff --git a/files/templates/sidebar_PCM.html b/files/templates/sidebar_PCM.html
index 75cae7e87b..6b0c6abacf 100644
--- a/files/templates/sidebar_PCM.html
+++ b/files/templates/sidebar_PCM.html
@@ -1,5 +1,6 @@
 <div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
-    <img src="/static/images/16412386045.webp" width="100%">
+    <img role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage(this.src)" loading="lazy" src="/static/images/16412386045.webp" width=100%>
+
 
 <a class="btn btn-primary btn-block mt-4" href="https://ip2.network">STREAM LIST</a>
 <a class="btn btn-primary btn-block" href="/post/4103">BUGS/SUGGESTIONS MEGATHREAD</a>
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 3f99ec9470..4403c50199 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -121,7 +121,7 @@
 														</div>
 
 														{% if hcaptcha %}
-															<div class="h-captcha" data-sitekey="{{ hcaptcha }}"></div>
+															<div class="h-captcha" data-sitekey="{{hcaptcha}}"></div>
 														{% endif %}
 
 														<button class="btn btn-primary login w-100 mt-3" id="register_button">Register</button>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 94a899d1cc..957240e81d 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -144,7 +144,7 @@
 <meta property="og:title" content="{{'@'+comment_info.author.username}} comments on {{p.plaintitle(v)}} - {{SITE_NAME}}" >
 <meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE_NAME}}/static/assets/images/{{SITE_NAME}}/preview.gif{% endif %}" >
 {% if p.is_video %}
-	<meta property="og:video" content="{{ p.realurl(v) }}" >
+	<meta property="og:video" content="{{p.realurl(v)}}" >
 {% endif %}
 <meta property="og:url" content="{{comment_info.permalink | full_link}}" >
 <meta property="og:site_name" content="{{request.host}}" >
@@ -169,7 +169,7 @@
 <meta property="og:title" content="{{p.plaintitle(v)}} - {{SITE_NAME}}" >
 <meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE_NAME}}/static/assets/images/{{SITE_NAME}}/preview.gif{% endif %}" >
 {% if p.url and p.is_video %}
-<meta property="og:video" content="{{ p.realurl(v) }}" >
+<meta property="og:video" content="{{p.realurl(v)}}" >
 {% endif %}
 <meta property="og:url" content="{{p.permalink | full_link}}" >
 <meta property="og:site_name" content="{{request.host}}" >
@@ -295,7 +295,7 @@
 						<button id="unmark2-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast2('/toggle_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center text-danger mr-3"></i>Unmark +18</button>
 
 						{% if v.id!=p.author_id %}
-							<button id="ban2-{{p.id}}" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{ p.author.id }}', '{{p.author.username}}')" class="{% if p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button"><i class="fas fa-user-minus mr-3"></i>Ban user</button>
+							<button id="ban2-{{p.id}}" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{p.author.id}}', '{{p.author.username}}')" class="{% if p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button"><i class="fas fa-user-minus mr-3"></i>Ban user</button>
 							<button id="unban2-{{p.id}}" class="{% if not p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast2('/unban_user/{{p.author_id}}','ban2-{{p.id}}','unban2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-user-minus mr-3"></i>Unban user</button>
 						{% endif %}
 
@@ -370,7 +370,7 @@
 						<pre></pre>
 						<ul style="padding-left:20px; margin-bottom: 0;">
 							{% for f in p.flags %}
-								<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/p{{ f.id }}')">[remove]</a>{% endif %}</li>
+								<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/p{{f.id}}')">[remove]</a>{% endif %}</li>
 							{% endfor %}
 						</ul>
 					</div>
@@ -508,7 +508,7 @@
 							<div class="row no-gutters">
 								<div id="frontpage" class="col-12 pt-0">
 								<div class="posts" id="posts">
-									{{ p.embed_url | post_embed(v) | safe }}
+									{{p.embed_url | post_embed(v) | safe}}
 								</div>
 								</div>
 							</div>
@@ -610,7 +610,7 @@
 							{% endif %}
 
 							{% if v.admin_level > 1 and v.id!=p.author_id %}
-								<a id="ban-{{p.id}}" class="{% if p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" role="button" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{ p.author.id }}', '{{p.author.username}}')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
+								<a id="ban-{{p.id}}" class="{% if p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" role="button" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{p.author.id}}', '{{p.author.username}}')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
 								<a id="unban-{{p.id}}" class="{% if not p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" id="unexile2-user-{{p.id}}" role="button" onclick="post_toast2('/unban_user/{{p.author_id}}','ban-{{p.id}}','unban-{{p.id}}')"><i class="fas fa-user-slash"></i>Unban user</a>
 							{% endif %}
 						{% endif %}
@@ -869,8 +869,8 @@
 
 		{% if "?context" not in request.full_path %}
 			const comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
-			const newTotal = {{p.comment_count}} || ((comments['{{p.id}}'] || { c: 0 }).c + 1)
-			comments['{{p.id}}'] = { c: newTotal, t: Date.now() }
+			const newTotal = {{p.comment_count}} || ((comments['{{p.id}}'] || {c: 0}).c + 1)
+			comments['{{p.id}}'] = {c: newTotal, t: Date.now()}
 			window.localStorage.setItem("comment-counts", JSON.stringify(comments))
 		{% endif %}
 	})()
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index b0f22e7ea6..664c6fcc2b 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -86,7 +86,7 @@
 		<pre></pre>
 		<ul style="padding-left:20px; margin-bottom: 0;">
 			{% for f in p.flags %}
-				<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/p{{ f.id }}')">[remove]</a>{% endif %}</li>
+				<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/p{{f.id}}')">[remove]</a>{% endif %}</li>
 			{% endfor %}
 		</ul>
 	</div>
@@ -141,7 +141,7 @@
 						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
 					</a>
 				{% elif p.is_image %}
-					<a role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{p.realurl(v)}}" onclick="expandDesktopImage('{{ p.realurl(v) }}')">
+					<a role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{p.realurl(v)}}')">
 						<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">
 					</a>
 				{% elif p.is_video %}
@@ -301,7 +301,7 @@
 								{% endif %}
 
 								{% if v.admin_level > 1 and v.id != p.author_id %}
-									<a id="ban-{{p.id}}" class="dropdown-item {% if p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" id="exile-comment-{{p.id}}" role="button" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{ p.author.id }}', '{{p.author.username}}')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
+									<a id="ban-{{p.id}}" class="dropdown-item {% if p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" id="exile-comment-{{p.id}}" role="button" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{p.author.id}}', '{{p.author.username}}')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
 									<a id="unban-{{p.id}}" class="dropdown-item {% if not p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" id="unexile2-user-{{p.id}}" role="button" onclick="post_toast2('/unban_user/{{p.author_id}}','ban-{{p.id}}','unban-{{p.id}}')"><i class="fas fa-user-slash"></i>Unban user</a>
 								{% endif %}
 							</ul>
@@ -490,7 +490,7 @@
 						<button id="unmark2-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast2('/toggle_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center text-danger mr-3"></i>Unmark +18</button>
 
 						{% if v.id!=p.author_id %}
-							<button id="ban2-{{p.id}}" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{ p.author.id }}', '{{p.author.username}}')" class="{% if p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button"><i class="fas fa-user-minus mr-3"></i>Ban user</button>
+							<button id="ban2-{{p.id}}" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{p.author.id}}', '{{p.author.username}}')" class="{% if p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button"><i class="fas fa-user-minus mr-3"></i>Ban user</button>
 							<button id="unban2-{{p.id}}" class="{% if not p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast2('/unban_user/{{p.author_id}}','ban2-{{p.id}}','unban2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-user-minus mr-3"></i>Unban user</button>
 						{% endif %}
 
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 5dbcd7867b..47fc15ed82 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -43,8 +43,8 @@
 						<div id="profilestuff" class="ml-3 w-100">
 							{% if u.is_suspended %}
 								<h5 class="text-primary">BANNED USER{% if u.ban_reason %}:
-									{% if u.ban_reason_link %}<a href="{{ u.ban_reason_link }}"><i class="fas fa-link"></i>{% endif %}
-										{{ u.ban_reason }}
+									{% if u.ban_reason_link %}<a href="{{u.ban_reason_link}}"><i class="fas fa-link"></i>{% endif %}
+										{{u.ban_reason}}
 									{% if u.ban_reason_link %}</a>{% endif %}
 								{% endif %}</h5>
 								{% if u.unban_utc %}<h5 class="text-primary">>{{u.unban_string}}</h5>{% endif %}