From cb2fc90770b643f6fb0bd73c17b1de0f3cddfbbb Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sat, 22 Jan 2022 00:27:10 +0200
Subject: [PATCH] gfdg

---
 files/classes/badges.py                 | 2 +-
 files/templates/admin/badge_grant.html  | 2 +-
 files/templates/admin/badge_remove.html | 2 +-
 files/templates/badges.html             | 2 +-
 files/templates/patrons.html            | 2 +-
 files/templates/submission.html         | 6 +++---
 files/templates/submission_listing.html | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/files/classes/badges.py b/files/classes/badges.py
index bae3abea6..8c2d41456 100644
--- a/files/classes/badges.py
+++ b/files/classes/badges.py
@@ -53,7 +53,7 @@ class Badge(Base):
 	@property
 	@lazy
 	def path(self):
-		return f"/static/assets/images/badges/{self.name.replace(' ','%20')}.webp?a=5"
+		return f"/static/assets/images/badges/{self.badge_id}.webp?a=5"
 
 	@property
 	@lazy
diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html
index 10b4d2f7e..3cd252d39 100644
--- a/files/templates/admin/badge_grant.html
+++ b/files/templates/admin/badge_grant.html
@@ -60,7 +60,7 @@
 			<label class="custom-control-label" for="{{k}}"></label>
 		</div>		
 	</td>
-	<td><label for="badge-{{k}}"><img alt="{{v['name']}}" loading="lazy" src="/static/assets/images/badges/{{v['name']}}.webp?a=5" width="70px" height="70px"></label></td>
+	<td><label for="badge-{{k}}"><img alt="{{v['name']}}" loading="lazy" src="/static/assets/images/badges/{{k}}.webp?a=5" width="70px" height="70px"></label></td>
 	<td>{{v['name']}}</td>
 	<td>{{v['description']}}</td>
 </tr>
diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html
index c225978c3..712d66c1d 100644
--- a/files/templates/admin/badge_remove.html
+++ b/files/templates/admin/badge_remove.html
@@ -60,7 +60,7 @@
 			<label class="custom-control-label" for="{{k}}"></label>
 		</div>		
 	</td>
-	<td><label for="badge-{{k}}"><img alt="{{v['name']}}" loading="lazy" src="/static/assets/images/badges/{{v['name']}}.webp?a=5" width="70px" height="70px"></label></td>
+	<td><label for="badge-{{k}}"><img alt="{{v['name']}}" loading="lazy" src="/static/assets/images/badges/{{k}}.webp?a=5" width="70px" height="70px"></label></td>
 	<td>{{v['name']}}</td>
 	<td>{{v['description']}}</td>
 </tr>
diff --git a/files/templates/badges.html b/files/templates/badges.html
index f244aab80..259fdb899 100644
--- a/files/templates/badges.html
+++ b/files/templates/badges.html
@@ -21,7 +21,7 @@
 {% for k,v in badges.items() %}
 	<tr>
 		<td>{{v['name']}}</td>
-		<td><img alt="{{v['name']}}" loading="lazy" src="/static/assets/images/badges/{{v['name']}}.webp?a=5" width=50 height=50>
+		<td><img alt="{{v['name']}}" loading="lazy" src="/static/assets/images/badges/{{k}}.webp?a=5" width=50 height=50>
 		<td>{{v['description']}}</td>
 	</tr>
 {% endfor %}
diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index e2e36ab0c..02d7506dd 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -14,7 +14,7 @@
 		<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><img alt="Patron-{{u.patron}}" loading="lazy" width=32 height=32 src="/static/assets/images/badges/Patron-{{u.patron}}.webp?a=5"></td>
+		<td><img alt="2{{u.patron}}" loading="lazy" width=32 height=32 src="/static/assets/images/badges/2{{u.patron}}.webp?a=5"></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 4ec3b2c25..870ad62c7 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -356,11 +356,11 @@
 						{% if p.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
 						{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
 						{% if p.active_flags %}<a class="btn btn-primary" role="button" style="padding:1px 5px; font-size:10px;" onclick="document.getElementById('flaggers').classList.toggle('d-none')">{{p.active_flags}} Reports</a>{% endif %}
-						{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{p.author.verified}}"></i>
-						{% endif %}
 						{% if p.author_name == '👻' %}
 							👻
-						{% else %}	
+						{% else %}
+							{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{p.author.verified}}"></i>
+							{% endif %}
 							<a class="user-name text-decoration-none" onclick='popclick({{p.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: #{{p.author.namecolor}}; font-weight: bold;" class="user-name"><img alt="@{{p.author_name}}'s profile picture" loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and request.host == 'rdrama.net' %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{% if p.author.quadrant %}<img alt="{{p.author.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{p.author.quadrant}}.webp?a=3">{% endif %}{{p.author.customtitle | safe}}</bdi>{% endif %}
 						{% endif %}
 						<span data-bs-toggle="tooltip" data-bs-placement="bottom" id="timestamp" onmouseover="timestamp('timestamp','{{p.created_utc}}')">&nbsp;{{p.age_string}}</span>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 3e0378543..14613a96c 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -187,11 +187,11 @@
 				{% if p.is_blocked %}<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="This user is blocking you."></i>{% endif %}
 				{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
 				{% if p.active_flags %}<a class="btn btn-primary" role="button" style="padding:1px 5px; font-size:10px;" onclick="document.getElementById('flaggers-{{p.id}}').classList.toggle('d-none')">{{p.active_flags}} Reports</a>{% endif %}
-				{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{p.author.verified}}"></i>
-				{% endif %}
 				{% if p.author_name == '👻' %}
 					👻
 				{% else %}
+					{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{p.author.verified}}"></i>
+					{% endif %}
 					<a class="user-name text-decoration-none" onclick='popclick({{p.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: #{{p.author.namecolor}};  font-weight: bold;"><img alt="@{{p.author.profile_url}}'s profile picture" loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and request.host == 'rdrama.net' %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}<bdi  style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{% if p.author.quadrant %}<img alt="{{p.author.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{p.author.quadrant}}.webp?a=1007">{% endif %}{{p.author.customtitle | safe}}</bdi>{% endif %}
 				{% endif %}
 				<span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('timestamp-{{p.id}}','{{p.created_utc}}')" id="timestamp-{{p.id}}">&nbsp;{{p.age_string}}</span>