From 8c25a48d0cfd6ba112d6287e9d3a0dafd4852c53 Mon Sep 17 00:00:00 2001
From: bAWario <22641966+bAWario@users.noreply.github.com>
Date: Thu, 14 Apr 2022 00:23:46 +0200
Subject: [PATCH 2/3] Glowiefied Checkmark (#226)

Co-authored-by: Captain <Captain@PC>
---
 files/templates/comments.html           | 2 +-
 files/templates/submission.html         | 2 +-
 files/templates/submission_listing.html | 2 +-
 files/templates/userpage.html           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index bd4ab6606..c6674d695 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -204,7 +204,7 @@
 						<img src="/assets/images/{{SITE_NAME}}/houses/{{c.author.house}}.webp?v=7" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" title="House {{c.author.house}}" alt="House {{c.author.house}}">
 					{% endif %}
 
-					{% if c.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if c.author.verifiedcolor %}#{{c.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{c.author.verified}}"></i>
+					{% if c.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if c.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if c.author.verifiedcolor %}#{{c.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{c.author.verified}}"></i>
 					{% endif %}
 					{% if not c.author %}
 						{{c.print()}}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 9afd7e09d..f9aff0837 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -649,7 +649,7 @@
 								<img src="/assets/images/{{SITE_NAME}}/houses/{{p.author.house}}.webp?v=7" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" title="House {{p.author.house}}" alt="House {{p.author.house}}">
 							{% 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" title="{{p.author.verified}}"></i>
+							{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if p.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" 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="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold"class="user-name"><img 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 SITE_NAME == 'rDrama' %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 						{% endif %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index fce286798..90789af04 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -192,7 +192,7 @@
 						<img src="/assets/images/{{SITE_NAME}}/houses/{{p.author.house}}.webp?v=7" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" title="House {{p.author.house}}" alt="House {{p.author.house}}">
 					{% 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" title="{{p.author.verified}}"></i>
+					{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if p.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" 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="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold;"><img 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 SITE_NAME == 'rDrama' %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}<bdi style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 				{% endif %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 05efab4d0..66b9504cc 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -64,7 +64,7 @@
 								{% endif %}
 
 								{% if u.verified %}
-									<span><i class="fas fa-badge-check align-middle ml-2" style="color:{% if u.verifiedcolor %}#{{u.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.verified}}"></i></span>
+									<span><i class="fas fa-badge-check align-middle ml-2 {% if u.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if u.verifiedcolor %}#{{u.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.verified}}"></i></span>
 								{% endif %}
 
 								{% if u.admin_level > 1 or (u.admin_level == 1 and not(v and v.admin_level > 1)) %}
@@ -385,7 +385,7 @@
 				{% endif %}
 
 				{% if u.verified %}
-					<span><i class="fas fa-badge-check align-middle ml-2" style="color:{% if u.verifiedcolor %}#{{u.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.verified}}"></i></span>&nbsp;
+					<span><i class="fas fa-badge-check align-middle ml-2 {% if u.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if u.verifiedcolor %}#{{u.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.verified}}"></i></span>&nbsp;
 				{% endif %}
 
 				{% if u.admin_level > 1 or (u.admin_level == 1 and not(v and v.admin_level > 1)) %}

From 5d6885e5bf1195555cf246e00744ecc7b8bcb9e6 Mon Sep 17 00:00:00 2001
From: reality500 <103607984+reality500@users.noreply.github.com>
Date: Wed, 13 Apr 2022 18:54:32 -0400
Subject: [PATCH 3/3] Add logged_out redirect (#227)

---
 files/routes/static.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/files/routes/static.py b/files/routes/static.py
index 6e6c8990c..9d3b964a8 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -16,6 +16,24 @@ def rdrama(id, title):
 	id = ''.join(f'{x}/' for x in id)
 	return redirect(f'/archives/drama/comments/{id}{title}.html')
 
+@app.get('/logged_out/')
+@app.get('/logged_out/<path:old>')
+def logged_out(old = ""):
+        # Remove trailing question mark from request.full_path which flask adds if there are no query parameters
+        redirect_url = request.full_path.replace("/logged_out", "", 1)
+        if redirect_url.endswith("?"):
+            redirect_url = redirect_url[:-1]
+
+        # Handle cases like /logged_out?asdf by adding a slash to the beginning
+        if not redirect_url.startswith('/'):
+            redirect_url = f"/{redirect_url}"
+
+        # Prevent redirect loop caused by visiting /logged_out/logged_out/logged_out/etc...
+        if redirect_url.startswith('/logged_out'):
+            abort(400)
+
+        return redirect(redirect_url)
+
 @app.get("/privacy")
 @auth_required
 def privacy(v):
@@ -438,4 +456,4 @@ def googleplayapp():
 @app.post("/dismiss_mobile_tip")
 def dismiss_mobile_tip():
 	session["tooltip_last_dismissed"] = int(time.time())
-	return "", 204
\ No newline at end of file
+	return "", 204