From bd6349d4486b361d582ab7b578fa33b82641f8f7 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Tue, 19 Apr 2022 22:22:24 +0200
Subject: [PATCH] Revert "RESTORE CACHE"

This reverts commit 3d193357ef86967ec7ce1cf73fca82fa0e807cf7.
---
 files/routes/comments.py     |  8 --------
 files/routes/front.py        |  8 --------
 files/routes/posts.py        |  8 --------
 files/routes/static.py       | 29 +++++++++++++++++----------
 files/routes/users.py        | 19 ------------------
 files/templates/default.html | 38 +++++++++++++++---------------------
 files/templates/login.html   |  2 +-
 files/templates/sign_up.html |  4 ++--
 8 files changed, 38 insertions(+), 78 deletions(-)

diff --git a/files/routes/comments.py b/files/routes/comments.py
index 6f5a5d457e..94e4d5427b 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -59,18 +59,10 @@ def pusher_thread(interests, c, username):
 
 @app.get("/comment/<cid>")
 @app.get("/post/<pid>/<anything>/<cid>")
-@app.get("/logged_out/comment/<cid>")
-@app.get("/logged_out/post/<pid>/<anything>/<cid>")
 @app.get("/h/<sub>/comment/<cid>")
 @app.get("/h/<sub>/post/<pid>/<anything>/<cid>")
-@app.get("/logged_out/h/<sub>/comment/<cid>")
-@app.get("/logged_out/h/<sub>/post/<pid>/<anything>/<cid>")
 @auth_desired
 def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None):
-	
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-	
-	if v and request.path.startswith('/logged_out'): v = None
 
 	try: cid = int(cid)
 	except: abort(404)
diff --git a/files/routes/front.py b/files/routes/front.py
index 004615cdfe..c6993c5fd6 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -157,11 +157,8 @@ def notifications(v):
 
 
 @app.get("/")
-@app.get("/logged_out")
 @app.get("/h/<sub>")
-@app.get("/logged_out/h/<sub>")
 @app.get("/s/<sub>")
-@app.get("/logged_out/s/<sub>")
 @limiter.limit("3/second;30/minute;1000/hour;5000/day")
 @auth_desired
 def front_all(v, sub=None, subdomain=None):
@@ -172,11 +169,6 @@ def front_all(v, sub=None, subdomain=None):
 	if g.webview and not session.get("session_id"):
 		session["session_id"] = secrets.token_hex(49)
 
-	if not v and request.path == "/" and not request.headers.get("Authorization"):
-		return redirect(f"/logged_out{request.full_path}")
-
-	if v and request.path.startswith('/logged_out'): v = None
-
 	try: page = max(int(request.values.get("page", 1)), 1)
 	except: abort(400)
 
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 737ce13ecf..880882aedc 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -114,18 +114,10 @@ def submit_get(v, sub=None):
 
 @app.get("/post/<pid>")
 @app.get("/post/<pid>/<anything>")
-@app.get("/logged_out/post/<pid>")
-@app.get("/logged_out/post/<pid>/<anything>")
 @app.get("/h/<sub>/post/<pid>")
 @app.get("/h/<sub>/post/<pid>/<anything>")
-@app.get("/logged_out/h/<sub>/post/<pid>")
-@app.get("/logged_out/h/<sub>/post/<pid>/<anything>")
 @auth_desired
 def post_id(pid, anything=None, v=None, sub=None):
-	if not v and not request.path.startswith('/logged_out') and not request.headers.get("Authorization"):
-		return redirect(f"/logged_out{request.full_path}")
-
-	if v and request.path.startswith('/logged_out'): v = None
 
 	try: pid = int(pid)
 	except Exception as e: pass
diff --git a/files/routes/static.py b/files/routes/static.py
index 9c13944b8d..4b6ca623e7 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -16,6 +16,25 @@ 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):
@@ -44,23 +63,13 @@ def marsey_list():
 	return str(marseys).replace("'",'"')
 
 @app.get("/terms")
-@app.get("/logged_out/terms")
 @auth_desired
 def terms(v):
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-
-	if v and request.path.startswith('/logged_out'): v = None
-
 	return render_template("terms.html", v=v)
 
 @app.get('/sidebar')
-@app.get('/logged_out/sidebar')
 @auth_desired
 def sidebar(v):
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-
-	if v and request.path.startswith('/logged_out'): v = None
-
 	return render_template('sidebar.html', v=v)
 
 
diff --git a/files/routes/users.py b/files/routes/users.py
index 5c968b6af8..456496ac04 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -833,16 +833,10 @@ def visitors(v):
 
 
 @app.get("/@<username>")
-@app.get("/logged_out/@<username>")
 @auth_desired
 def u_username(username, v=None):
 
 
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-
-	if v and request.path.startswith('/logged_out'): v = None
-
-
 	u = get_user(username, v=v)
 
 
@@ -926,15 +920,9 @@ def u_username(username, v=None):
 
 
 @app.get("/@<username>/comments")
-@app.get("/logged_out/@<username>/comments")
 @auth_desired
 def u_username_comments(username, v=None):
 
-
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-
-	if v and request.path.startswith('/logged_out'): v = None
-
 	user = get_user(username, v=v)
 
 	if username != user.username: return redirect(f'/@{user.username}/comments')
@@ -1113,11 +1101,8 @@ def remove_follow(username, v):
 	return {"message": "Follower removed!"}
 
 @app.get("/pp/<id>")
-@app.get("/logged_out/pp/<id>")
 @app.get("/uid/<id>/pic")
-@app.get("/logged_out/uid/<id>/pic")
 @app.get("/uid/<id>/pic/profile")
-@app.get("/logged_out/uid/<id>/pic/profile")
 @limiter.exempt
 @auth_desired
 def user_profile_uid(v, id):
@@ -1126,10 +1111,6 @@ def user_profile_uid(v, id):
 		try: id = int(id, 36)
 		except: abort(404)
 
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-
-	if v and request.path.startswith('/logged_out'): v = None
-
 	x=get_account(id)
 	return redirect(x.profile_url)
 
diff --git a/files/templates/default.html b/files/templates/default.html
index c76cadc4a4..4894587e21 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -226,30 +226,24 @@
  <body id="{% if request.path != '/comments' %}{% block pagetype %}frontpage{% endblock %}{% endif %}" {% if SITE_NAME == 'rDrama' and not v or v and (v.shadowbanned or v.is_banned or v.agendaposter) %}style="overflow-x: hidden;background:url(/assets/images/backgrounds/anime/1.webp?v=3) center center fixed; background-color: var(--background)"{% elif v and v.background %}style="{% if path != '/formatting' %}overflow-x: hidden; {% endif %} background:url(/assets/images/backgrounds/{{v.background}}?v=3) center center fixed; background-color: var(--background){% if 'anime' not in v.background %};background-size: cover{% endif %}"{% endif %}>
 
 {% block Banner %}
-	{% if '@' not in request.path %}
-		{% if v %}
-			{% if sub %}
-				<img alt="/h/{{sub.name}} banner" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{sub.banner_url}}')" loading="lazy" src="{{sub.banner_url}}" width=100% style="object-fit:cover;max-height:25vw">
-			{% elif SITE_NAME == 'rDrama' %}
-				{% set path = "assets/images/" + SITE_NAME + "/banners" %}
-				{% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=24' %}
+	{% if '@' not in request.path %}		
+		{% if sub %}
+			<img alt="/h/{{sub.name}} banner" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{sub.banner_url}}')" loading="lazy" src="{{sub.banner_url}}" width=100% style="object-fit:cover;max-height:25vw">
+		{% elif SITE_NAME == 'rDrama' %}
+			{% set path = "assets/images/" + SITE_NAME + "/banners" %}
+			{% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=24' %}
 
-				<a href="https://secure.transequality.org/site/Donation2?df_id=1480">
-					{% if v and (v.shadowbanned or v.is_banned or v.agendaposter) %}
-						<img alt="site banner" src="/assets/images/rDrama/banner2.webp?v=1" width="100%">
-					{% else %}
-						<img alt="site banner" src="{{image}}" width="100%">
-					{% endif %}
-				</a>
-			{% else %}
-				<a href="/">
-					<img alt="site banner" src="/assets/images/{{SITE_NAME}}/banner.webp?v=1042" width="100%">
-				</a>	
-			{% endif %}
-		{% else %}
-			<a href="/login">
-				<img class="banner" alt="site banner" src="/assets/images/{{SITE_NAME}}/cached.webp?v=1013" width="100%">
+			<a href="https://secure.transequality.org/site/Donation2?df_id=1480">
+				{% if v and (v.shadowbanned or v.is_banned or v.agendaposter) %}
+					<img alt="site banner" src="/assets/images/rDrama/banner2.webp?v=1" width="100%">
+				{% else %}
+					<img alt="site banner" src="{{image}}" width="100%">
+				{% endif %}
 			</a>
+		{% else %}
+			<a href="/">
+				<img alt="site banner" src="/assets/images/{{SITE_NAME}}/banner.webp?v=1042" width="100%">
+			</a>	
 		{% endif %}
 	{% endif %}
 {% endblock %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 94ff645953..ad85d11687 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -91,7 +91,7 @@
 {% if g.webview %}														<div class="custom-control custom-checkbox mt-4">
 																<input autocomplete="off" type="checkbox" class="custom-control-input" id="termsCheck" required>
 																<label class="custom-control-label terms" for="termsCheck">I accept the <a
-																		href="/logged_out/terms" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>terms of use</a></label>
+																		href="/terms" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>terms of use</a></label>
 														</div>
 {% endif %}
 														<div class="text-center text-muted text-small mt-5 mb-3">
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 3f0ca0cc6d..0c8f9d06a2 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -112,9 +112,9 @@
 														<input autocomplete="off" type="checkbox" class="custom-control-input" id="termsCheck" required>
 														<label class="custom-control-label terms" for="termsCheck">I accept the <a
 														{% if g.webview %}
-															href="/logged_out/terms">terms of use
+															href="/terms">terms of use
 														{% else %}
-															href="/logged_out/sidebar">rules
+															href="/sidebar">rules
 														{% endif %}
 														</a></label>
 												</div>