From c9b3e8528d91a35ac0dfe0b3c84212ea03f02613 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 2 Apr 2022 21:42:21 +0200 Subject: [PATCH] fsd --- files/routes/comments.py | 8 -------- files/routes/posts.py | 8 -------- files/routes/static.py | 10 ---------- files/routes/users.py | 12 ------------ files/templates/login.html | 2 +- files/templates/sign_up.html | 4 ++-- 6 files changed, 3 insertions(+), 41 deletions(-) diff --git a/files/routes/comments.py b/files/routes/comments.py index 4b9c05df2..ab401054e 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -60,18 +60,10 @@ def pusher_thread(interests, c): @app.get("/comment/") @app.get("/post///") -@app.get("/logged_out/comment/") -@app.get("/logged_out/post///") @app.get("/h//comment/") @app.get("/h//post///") -@app.get("/logged_out/h//comment/") -@app.get("/logged_out/h//post///") @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/posts.py b/files/routes/posts.py index 179414e37..88d6c494f 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -114,18 +114,10 @@ def submit_get(v, sub=None): @app.get("/post/") @app.get("/post//") -@app.get("/logged_out/post/") -@app.get("/logged_out/post//") @app.get("/h//post/") @app.get("/h//post//") -@app.get("/logged_out/h//post/") -@app.get("/logged_out/h//post//") @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 4cf992ae1..0e56a5411 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -38,23 +38,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 6667a2f2c..6f913576c 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -796,16 +796,10 @@ def visitors(v): @app.get("/@") -@app.get("/logged_out/@") @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) @@ -888,15 +882,9 @@ def u_username(username, v=None): @app.get("/@/comments") -@app.get("/logged_out/@/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') diff --git a/files/templates/login.html b/files/templates/login.html index 91b7d6f2e..d53708e08 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -91,7 +91,7 @@ {% if g.webview %}
+ href="/terms" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>terms of use
{% endif %}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index b0b93c595..1a528abf2 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -112,9 +112,9 @@