From 26549a6e6622a3dec0ce094a251b9ea2ed71b9c9 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Tue, 8 Nov 2022 21:35:24 -0800 Subject: [PATCH] remove logged out routes (#433) * remove /logged_out/ routes * update sitemap, remove users route, and update header * cloudflare cookie * only mess with the cookie whenever we desire auth * sitemap: (small) improvements sitemap: fix little bug i introduced sitemap: fix login redirects for /id/ routes * sitemap: remove duplicate entry * contact is auth desired * imports: don't import what we don't need and bind late to the db * praying to god this works * keep yourself safe * oh i actually need to commit and push lol * import Sub * t * refix cache purger --- files/__main__.py | 7 +- files/assets/sitemap.xml | 486 +++++++++++++++++------------------- files/classes/user.py | 1 + files/helpers/actions.py | 9 + files/helpers/cloudflare.py | 10 +- files/helpers/const.py | 29 +-- files/helpers/marsify.py | 2 +- files/helpers/sanitize.py | 21 +- files/helpers/wrappers.py | 16 +- files/routes/__init__.py | 4 + files/routes/admin.py | 4 +- files/routes/comments.py | 4 - files/routes/front.py | 10 +- files/routes/login.py | 12 +- files/routes/posts.py | 4 - files/routes/static.py | 2 - files/routes/users.py | 5 - files/templates/header.html | 4 +- files/templates/home.html | 2 +- 19 files changed, 292 insertions(+), 340 deletions(-) diff --git a/files/__main__.py b/files/__main__.py index 1172029e9..c40a11d3e 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -2,6 +2,7 @@ import gevent.monkey gevent.monkey.patch_all() from os import environ, path import secrets +from files.helpers.cloudflare import CLOUDFLARE_AVAILABLE from flask import * from flask_caching import Cache from flask_limiter import Limiter @@ -103,7 +104,6 @@ def before_request(): if not request.path: request.path = '/' request.full_path = request.full_path.rstrip('?').rstrip('/') if not request.full_path: request.full_path = '/' - if not session.get("session_id"): session.permanent = True session["session_id"] = secrets.token_hex(49) @@ -111,6 +111,9 @@ def before_request(): @app.after_request def after_request(response): if response.status_code < 400: + if CLOUDFLARE_AVAILABLE and CLOUDFLARE_COOKIE_VALUE and getattr(g, 'desires_auth', False): + logged_in = bool(getattr(g, 'v', None)) + response.set_cookie("lo", CLOUDFLARE_COOKIE_VALUE if logged_in else '', max_age=60*60*24*365 if logged_in else 1) g.db.commit() g.db.close() del g.db @@ -118,7 +121,7 @@ def after_request(response): @app.teardown_appcontext def teardown_request(error): - if hasattr(g, 'db') and g.db: + if getattr(g, 'db', None): g.db.rollback() g.db.close() del g.db diff --git a/files/assets/sitemap.xml b/files/assets/sitemap.xml index 95e1905a1..956da5b3d 100644 --- a/files/assets/sitemap.xml +++ b/files/assets/sitemap.xml @@ -6,17 +6,12 @@ http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> - https://rdrama.net/logged_out + https://rdrama.net 2022-06-10T23:42:26+00:00 1.00 - https://rdrama.net/logged_out/post/19236/ - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/logged_out/ + https://rdrama.net/post/19236/ 2022-06-10T23:42:26+00:00 0.80 @@ -26,12 +21,7 @@ 0.80 - https://rdrama.net/login?redirect=%2Fcontact%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=/logged_out + https://rdrama.net/contact 2022-06-10T23:42:26+00:00 0.80 @@ -81,107 +71,107 @@ 0.80 - https://rdrama.net/logged_out/post/16583 + https://rdrama.net/post/16583 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/18459 + https://rdrama.net/post/18459 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/75878 + https://rdrama.net/post/75878 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/33652 + https://rdrama.net/post/33652 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/35835 + https://rdrama.net/post/35835 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/37677 + https://rdrama.net/post/37677 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/39413 + https://rdrama.net/post/39413 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/19711/a-short-guide-on-how-to + https://rdrama.net/post/19711/a-short-guide-on-how-to 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=hot&t=hour&ccmode=false + https://rdrama.net/?sort=hot&t=hour 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=hot&t=week&ccmode=false + https://rdrama.net/?sort=hot&t=week 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=hot&t=month&ccmode=false + https://rdrama.net/?sort=hot&t=month 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=hot&t=year&ccmode=false + https://rdrama.net/?sort=hot&t=year 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=hot&t=all&ccmode=false + https://rdrama.net/?sort=hot&t=all 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=bump&t=day&ccmode=false + https://rdrama.net/?sort=bump&t=day 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=top&t=day&ccmode=false + https://rdrama.net/?sort=top&t=day 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=bottom&t=day&ccmode=false + https://rdrama.net/?sort=bottom&t=day 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=new&t=day&ccmode=false + https://rdrama.net/?sort=new&t=day 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=old&t=day&ccmode=false + https://rdrama.net/?sort=old&t=day 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=controversial&t=day&ccmode=false + https://rdrama.net/?sort=controversial&t=day 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out?sort=comments&t=day&ccmode=false + https://rdrama.net/?sort=comments&t=day 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/75837/dramafitness-megathread-9-the-biggining-of + https://rdrama.net/post/75837/dramafitness-megathread-9-the-biggining-of 2022-06-10T23:42:26+00:00 0.80 @@ -196,7 +186,7 @@ 0.80 - https://rdrama.net/logged_out/post/75977/india-is-currently-feuding-with-the + https://rdrama.net/post/75977/india-is-currently-feuding-with-the 2022-06-10T23:42:26+00:00 0.80 @@ -211,7 +201,7 @@ 0.80 - https://rdrama.net/logged_out/post/75950/grift-zero-of-the-adderall-epidemic + https://rdrama.net/post/75950/grift-zero-of-the-adderall-epidemic 2022-06-10T23:42:26+00:00 0.80 @@ -221,7 +211,7 @@ 0.80 - https://rdrama.net/logged_out/post/75959/twitter-marseytrain-activates-the-nuclear-option + https://rdrama.net/post/75959/twitter-marseytrain-activates-the-nuclear-option 2022-06-10T23:42:26+00:00 0.80 @@ -231,7 +221,7 @@ 0.80 - https://rdrama.net/logged_out/post/75968/marseylove-love-for-metadrama-marseylove + https://rdrama.net/post/75968/marseylove-love-for-metadrama-marseylove 2022-06-10T23:42:26+00:00 0.80 @@ -241,22 +231,22 @@ 0.80 - https://rdrama.net/login?redirect=%2Fid%2F6345%3F + https://rdrama.net/id/6345 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F5800%3F + https://rdrama.net/id/5800 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F2663%3F + https://rdrama.net/id/2663 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F8494%3F + https://rdrama.net/id/8494 2022-06-10T23:42:26+00:00 0.80 @@ -266,7 +256,7 @@ 0.80 - https://rdrama.net/logged_out/post/75957/they-hated-her-because-she-told + https://rdrama.net/post/75957/they-hated-her-because-she-told 2022-06-10T23:42:26+00:00 0.80 @@ -276,7 +266,7 @@ 0.80 - https://rdrama.net/logged_out/post/75945/who-factchecks-the-factchecker + https://rdrama.net/post/75945/who-factchecks-the-factchecker 2022-06-10T23:42:26+00:00 0.80 @@ -286,7 +276,7 @@ 0.80 - https://rdrama.net/logged_out/post/76001/scrotes-are-so-fucking-pathetic-omg + https://rdrama.net/post/76001/scrotes-are-so-fucking-pathetic-omg 2022-06-10T23:42:26+00:00 0.80 @@ -301,7 +291,7 @@ 0.80 - https://rdrama.net/logged_out/post/75914/gentlemen-ladies-after-a-month-of + https://rdrama.net/post/75914/gentlemen-ladies-after-a-month-of 2022-06-10T23:42:26+00:00 0.80 @@ -311,17 +301,17 @@ 0.80 - https://rdrama.net/logged_out/post/58808/alright-dramatards-time-to-vote-marseyridin + https://rdrama.net/post/58808/alright-dramatards-time-to-vote-marseyridin 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F5526%3F + https://rdrama.net/id/5526 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/75921/this-schizosorenspam-shit-is-annoying-and + https://rdrama.net/post/75921/this-schizosorenspam-shit-is-annoying-and 2022-06-10T23:42:26+00:00 0.80 @@ -331,67 +321,67 @@ 0.80 - https://rdrama.net/logged_out/h/schizocel/post/75609/replace-soren-with-schizocel-and-this + https://rdrama.net/h/schizocel/post/75609/replace-soren-with-schizocel-and-this 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F1376%3F + https://rdrama.net/id/1376 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F2546%3F + https://rdrama.net/id/2546 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F10092%3F + https://rdrama.net/id/10092 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F3511%3F + https://rdrama.net/id/3511 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F560%3F + https://rdrama.net/id/560 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F636%3F + https://rdrama.net/id/636 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F541%3F + https://rdrama.net/id/541 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F4003%3F + https://rdrama.net/id/4003 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F9334%3F + https://rdrama.net/id/9334 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F5188%3F + https://rdrama.net/id/5188 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/h/schizocel/post/75884/the-magnitude-of-convoluted-inside-jokes + https://rdrama.net/h/schizocel/post/75884/the-magnitude-of-convoluted-inside-jokes 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/h/schizocel + https://rdrama.net/h/schizocel 2022-06-10T23:42:26+00:00 0.80 @@ -401,7 +391,7 @@ 0.80 - https://rdrama.net/logged_out/post/75989/foid-refused-mandatory-sympathy-while-posting + https://rdrama.net/post/75989/foid-refused-mandatory-sympathy-while-posting 2022-06-10T23:42:26+00:00 0.80 @@ -411,7 +401,7 @@ 0.80 - https://rdrama.net/logged_out/post/75987/tw-i-need-to-get-a + https://rdrama.net/post/75987/tw-i-need-to-get-a 2022-06-10T23:42:26+00:00 0.80 @@ -421,7 +411,7 @@ 0.80 - https://rdrama.net/logged_out/post/75976/internal-server-error + https://rdrama.net/post/75976/internal-server-error 2022-06-10T23:42:26+00:00 0.80 @@ -431,17 +421,17 @@ 0.80 - https://rdrama.net/logged_out/h/braincels + https://rdrama.net/h/braincels 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/75897/jokers-2-is-confirmed + https://rdrama.net/post/75897/jokers-2-is-confirmed 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/75994/i-really-love-marseyismywaifu + https://rdrama.net/post/75994/i-really-love-marseyismywaifu 2022-06-10T23:42:26+00:00 0.80 @@ -451,7 +441,7 @@ 0.80 - https://rdrama.net/logged_out/post/75931/marseyklennyclap + https://rdrama.net/post/75931/marseyklennyclap 2022-06-10T23:42:26+00:00 0.80 @@ -461,7 +451,7 @@ 0.80 - https://rdrama.net/logged_out/post/75899/do-not-forgive-do-not-forget + https://rdrama.net/post/75899/do-not-forgive-do-not-forget 2022-06-10T23:42:26+00:00 0.80 @@ -471,7 +461,7 @@ 0.80 - https://rdrama.net/logged_out/post/75913/just-found-out-that-im-trans + https://rdrama.net/post/75913/just-found-out-that-im-trans 2022-06-10T23:42:26+00:00 0.80 @@ -481,7 +471,7 @@ 0.80 - https://rdrama.net/logged_out/post/75981/you-dont-want-to-try-anything + https://rdrama.net/post/75981/you-dont-want-to-try-anything 2022-06-10T23:42:26+00:00 0.80 @@ -491,7 +481,7 @@ 0.80 - https://rdrama.net/logged_out/post/75820/what-do-most-people-not-realize + https://rdrama.net/post/75820/what-do-most-people-not-realize 2022-06-10T23:42:26+00:00 0.80 @@ -506,7 +496,7 @@ 0.80 - https://rdrama.net/logged_out/post/75819/terf-islanders-decide-theyd-rather-die + https://rdrama.net/post/75819/terf-islanders-decide-theyd-rather-die 2022-06-10T23:42:26+00:00 0.80 @@ -516,7 +506,7 @@ 0.80 - https://rdrama.net/logged_out/post/75815/trans-allies-get-what-they-asked + https://rdrama.net/post/75815/trans-allies-get-what-they-asked 2022-06-10T23:42:26+00:00 0.80 @@ -526,12 +516,12 @@ 0.80 - https://rdrama.net/logged_out/h/anime + https://rdrama.net/h/anime 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/h/anime/post/75831/this-is-cirno + https://rdrama.net/h/anime/post/75831/this-is-cirno 2022-06-10T23:42:26+00:00 0.80 @@ -541,92 +531,92 @@ 0.80 - https://rdrama.net/login?redirect=%2Fid%2F7813%3F + https://rdrama.net/id/7813 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F296%3F + https://rdrama.net/id/296 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F1994%3F + https://rdrama.net/id/1994 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F9397%3F + https://rdrama.net/id/9397 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F1357%3F + https://rdrama.net/id/1357 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F8654%3F + https://rdrama.net/id/8654 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F1203%3F + https://rdrama.net/id/1203 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F7466%3F + https://rdrama.net/id/7466 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F7580%3F + https://rdrama.net/id/7580 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F3016%3F + https://rdrama.net/id/3016 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F9755%3F + https://rdrama.net/id/9755 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F5099%3F + https://rdrama.net/id/5099 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F7615%3F + https://rdrama.net/id/7615 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F10272%3F + https://rdrama.net/id/10272 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F9287%3F + https://rdrama.net/id/9287 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F10881%3F + https://rdrama.net/id/10881 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F1378%3F + https://rdrama.net/id/1378 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/login?redirect=%2Fid%2F1387%3F + https://rdrama.net/id/1387 2022-06-10T23:42:26+00:00 0.80 @@ -636,7 +626,7 @@ 0.80 - https://rdrama.net/logged_out/post/75847/terf-island-people-study-disturbing-moment + https://rdrama.net/post/75847/terf-island-people-study-disturbing-moment 2022-06-10T23:42:26+00:00 0.80 @@ -646,7 +636,7 @@ 0.80 - https://rdrama.net/logged_out/post/75943/serious-question-is-russia-winning-the + https://rdrama.net/post/75943/serious-question-is-russia-winning-the 2022-06-10T23:42:26+00:00 0.80 @@ -656,12 +646,12 @@ 0.80 - https://rdrama.net/login?redirect=%2Fid%2F30%3F + https://rdrama.net/id/30 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/post/76000/marseymuhammad-pbuh + https://rdrama.net/post/76000/marseymuhammad-pbuh 2022-06-10T23:42:26+00:00 0.80 @@ -671,12 +661,12 @@ 0.80 - https://rdrama.net/logged_out?sort=hot&page=2&t=day&ccmode=false + https://rdrama.net/?sort=hot&page=2&t=day 2022-06-10T23:42:26+00:00 0.80 - https://rdrama.net/logged_out/?sort=new&t=all + https://rdrama.net/?sort=new&t=all 2022-06-10T23:42:26+00:00 0.80 @@ -686,12 +676,12 @@ 0.80 - https://rdrama.net/login?redirect=/logged_out/post/19236/ + https://rdrama.net/login?redirect=/post/19236/ 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh 2022-06-10T23:42:26+00:00 0.64 @@ -701,22 +691,22 @@ 0.64 - https://rdrama.net/logged_out/post/19236/?sort=bottom + https://rdrama.net/post/19236/?sort=bottom 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/19236/?sort=new + https://rdrama.net/post/19236/?sort=new 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/19236/?sort=old + https://rdrama.net/post/19236/?sort=old 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/19236/?sort=controversial + https://rdrama.net/post/19236/?sort=controversial 2022-06-10T23:42:26+00:00 0.64 @@ -726,7 +716,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/477392?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/477392?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -741,7 +731,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/477413?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/477413?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -751,7 +741,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/478434?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478434?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -761,7 +751,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475015?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475015?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -771,7 +761,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475051?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475051?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -781,7 +771,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475057?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475057?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -791,7 +781,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475105?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475105?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -801,7 +791,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475734?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475734?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -811,7 +801,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475737?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475737?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -821,7 +811,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475766?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475766?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -831,7 +821,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475773?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475773?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -841,7 +831,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475949?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475949?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -851,12 +841,12 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/476002?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476002?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/476002 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476002 2022-06-10T23:42:26+00:00 0.64 @@ -871,7 +861,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/478275?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478275?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -881,7 +871,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/478149?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478149?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -891,7 +881,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/478992?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478992?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -901,7 +891,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/479126?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479126?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -911,7 +901,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/479546?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479546?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -921,7 +911,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/478895?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478895?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -931,7 +921,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475025?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475025?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -941,7 +931,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475043?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475043?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -951,7 +941,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475068?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475068?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -961,7 +951,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475084?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475084?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -971,7 +961,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475089?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475089?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -981,7 +971,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475097?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475097?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -991,7 +981,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475112?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475112?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1001,7 +991,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475220?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475220?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1011,7 +1001,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475026?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475026?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1026,7 +1016,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475028?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475028?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1036,7 +1026,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475035?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475035?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1046,7 +1036,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475085?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475085?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1056,7 +1046,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475044?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475044?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1066,7 +1056,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475081?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475081?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1076,7 +1066,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475140?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475140?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1086,7 +1076,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475215?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475215?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1096,7 +1086,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/1892325?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1892325?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1106,7 +1096,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/1892423?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1892423?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1116,7 +1106,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/1894344?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1894344?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1126,7 +1116,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475036?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475036?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1136,7 +1126,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475134?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475134?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1146,7 +1136,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475717?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475717?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1156,7 +1146,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/479427?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479427?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1166,7 +1156,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/476009?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476009?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1181,7 +1171,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475118?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475118?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1191,7 +1181,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475159?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475159?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1201,7 +1191,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475304?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475304?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1211,7 +1201,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475082?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475082?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1221,7 +1211,7 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/475325?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475325?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1231,82 +1221,77 @@ 0.64 - https://rdrama.net/logged_out/post/19236/marseylaugh-marseylaugh-marseylaugh/476597?context=8 + https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476597?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/60443/ + https://rdrama.net/post/60443/ 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/login?redirect=/logged_out/ + https://rdrama.net/?sort=hot&t=hour 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=hot&t=hour&ccmode=false + https://rdrama.net/?sort=hot&t=week 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=hot&t=week&ccmode=false + https://rdrama.net/?sort=hot&t=month 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=hot&t=month&ccmode=false + https://rdrama.net/?sort=hot&t=year 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=hot&t=year&ccmode=false + https://rdrama.net/?sort=hot&t=all 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=hot&t=all&ccmode=false + https://rdrama.net/?sort=bump&t=day 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=bump&t=day&ccmode=false + https://rdrama.net/?sort=top&t=day 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=top&t=day&ccmode=false + https://rdrama.net/?sort=bottom&t=day 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=bottom&t=day&ccmode=false + https://rdrama.net/?sort=new&t=day 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=new&t=day&ccmode=false + https://rdrama.net/?sort=old&t=day 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=old&t=day&ccmode=false + https://rdrama.net/?sort=controversial&t=day 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=controversial&t=day&ccmode=false + https://rdrama.net/?sort=comments&t=day 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/?sort=comments&t=day&ccmode=false - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/logged_out/?sort=hot&page=2&t=day&ccmode=false + https://rdrama.net/?sort=hot&page=2&t=day 2022-06-10T23:42:26+00:00 0.64 @@ -1356,7 +1341,7 @@ 0.64 - https://rdrama.net/logged_out/post/64305/ + https://rdrama.net/post/64305/ 2022-06-10T23:42:26+00:00 0.64 @@ -1366,7 +1351,7 @@ 0.64 - https://rdrama.net/logged_out/h/furry + https://rdrama.net/h/furry 2022-06-10T23:42:26+00:00 0.64 @@ -1381,7 +1366,7 @@ 0.64 - https://rdrama.net/logged_out/h/moemorphism + https://rdrama.net/h/moemorphism 2022-06-10T23:42:26+00:00 0.64 @@ -1396,7 +1381,7 @@ 0.64 - https://rdrama.net/logged_out/h/music + https://rdrama.net/h/music 2022-06-10T23:42:26+00:00 0.64 @@ -1411,7 +1396,7 @@ 0.64 - https://rdrama.net/logged_out/h/random + https://rdrama.net/h/random 2022-06-10T23:42:26+00:00 0.64 @@ -1446,7 +1431,7 @@ 0.64 - https://rdrama.net/logged_out/h/dankchristianmemes + https://rdrama.net/h/dankchristianmemes 2022-06-10T23:42:26+00:00 0.64 @@ -1461,7 +1446,7 @@ 0.64 - https://rdrama.net/logged_out/h/slackernews + https://rdrama.net/h/slackernews 2022-06-10T23:42:26+00:00 0.64 @@ -1476,7 +1461,7 @@ 0.64 - https://rdrama.net/logged_out/h/ducks + https://rdrama.net/h/ducks 2022-06-10T23:42:26+00:00 0.64 @@ -1491,7 +1476,7 @@ 0.64 - https://rdrama.net/logged_out/h/eevee + https://rdrama.net/h/eevee 2022-06-10T23:42:26+00:00 0.64 @@ -1506,7 +1491,7 @@ 0.64 - https://rdrama.net/logged_out/h/borgar + https://rdrama.net/h/borgar 2022-06-10T23:42:26+00:00 0.64 @@ -1521,7 +1506,7 @@ 0.64 - https://rdrama.net/logged_out/h/shrek_dick_dimension + https://rdrama.net/h/shrek_dick_dimension 2022-06-10T23:42:26+00:00 0.64 @@ -1536,7 +1521,7 @@ 0.64 - https://rdrama.net/logged_out/h/carpathianflorist + https://rdrama.net/h/carpathianflorist 2022-06-10T23:42:26+00:00 0.64 @@ -1551,12 +1536,7 @@ 0.64 - https://rdrama.net/login?redirect=/logged_out/post/16583 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other 2022-06-10T23:42:26+00:00 0.64 @@ -1566,22 +1546,22 @@ 0.64 - https://rdrama.net/logged_out/post/16583?sort=top + https://rdrama.net/post/16583?sort=top 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/16583?sort=bottom + https://rdrama.net/post/16583?sort=bottom 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/16583?sort=old + https://rdrama.net/post/16583?sort=old 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/16583?sort=controversial + https://rdrama.net/post/16583?sort=controversial 2022-06-10T23:42:26+00:00 0.64 @@ -1591,7 +1571,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2099220?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2099220?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1601,7 +1581,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2098425?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2098425?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1611,7 +1591,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2099170?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2099170?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1621,7 +1601,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2098186?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2098186?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1631,7 +1611,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2097709?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2097709?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1641,7 +1621,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2096229?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2096229?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1651,7 +1631,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2094034?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2094034?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1661,7 +1641,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2093551?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2093551?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1671,7 +1651,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2087416?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2087416?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1681,7 +1661,7 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2086725?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2086725?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1691,17 +1671,17 @@ 0.64 - https://rdrama.net/logged_out/post/16583/megathread-posts-here-marseys-or-other/2084709?context=8 + https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2084709?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/login?redirect=/logged_out/post/18459 + https://rdrama.net/login?redirect=/post/18459 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions 2022-06-10T23:42:26+00:00 0.64 @@ -1711,22 +1691,22 @@ 0.64 - https://rdrama.net/logged_out/post/18459?sort=top + https://rdrama.net/post/18459?sort=top 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/18459?sort=bottom + https://rdrama.net/post/18459?sort=bottom 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/18459?sort=old + https://rdrama.net/post/18459?sort=old 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/18459?sort=controversial + https://rdrama.net/post/18459?sort=controversial 2022-06-10T23:42:26+00:00 0.64 @@ -1736,12 +1716,12 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2099175?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2099175?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75637/changelog-hole-improvements-follow-holes-for/2091847?context=8 + https://rdrama.net/post/75637/changelog-hole-improvements-follow-holes-for/2091847?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1751,7 +1731,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2093336?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2093336?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1761,7 +1741,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2090949?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2090949?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1771,7 +1751,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091000?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091000?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1781,7 +1761,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2089369?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2089369?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1791,7 +1771,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2089221?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2089221?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1801,7 +1781,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2088542?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2088542?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1811,7 +1791,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2088023?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2088023?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1821,7 +1801,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2086651?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2086651?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1831,7 +1811,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2086711?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2086711?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1841,7 +1821,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091665?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091665?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1851,7 +1831,7 @@ 0.64 - https://rdrama.net/logged_out/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091794?context=8 + https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091794?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1861,12 +1841,12 @@ 0.64 - https://rdrama.net/login?redirect=/logged_out/post/75878 + https://rdrama.net/login?redirect=/post/75878 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc 2022-06-10T23:42:26+00:00 0.64 @@ -1876,22 +1856,22 @@ 0.64 - https://rdrama.net/logged_out/post/75878?sort=top + https://rdrama.net/post/75878?sort=top 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878?sort=bottom + https://rdrama.net/post/75878?sort=bottom 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878?sort=old + https://rdrama.net/post/75878?sort=old 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878?sort=controversial + https://rdrama.net/post/75878?sort=controversial 2022-06-10T23:42:26+00:00 0.64 @@ -1901,7 +1881,7 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097292?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097292?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1911,7 +1891,7 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097440?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097440?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1921,7 +1901,7 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097510?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097510?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1931,7 +1911,7 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097560?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097560?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1941,7 +1921,7 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097768?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097768?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1951,7 +1931,7 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097794?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097794?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1961,12 +1941,12 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097830?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097830?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/login?redirect=%2Fid%2F4284%3F + https://rdrama.net/id/4284 2022-06-10T23:42:26+00:00 0.64 @@ -1976,7 +1956,7 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097659?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097659?context=8 2022-06-10T23:42:26+00:00 0.64 @@ -1986,50 +1966,48 @@ 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097668?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097668?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097707?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097707?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097783?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097783?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2098316?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2098316?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2098333?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2098333?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2099121?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2099121?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2099067?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2099067?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097681?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097681?context=8 2022-06-10T23:42:26+00:00 0.64 - https://rdrama.net/logged_out/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097537?context=8 + https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097537?context=8 2022-06-10T23:42:26+00:00 0.64 - - diff --git a/files/classes/user.py b/files/classes/user.py index 3313ed515..ae1553596 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -2,6 +2,7 @@ from sqlalchemy.orm import deferred, aliased from sqlalchemy.sql import func from secrets import token_hex import pyotp +from files.classes.sub import Sub from files.helpers.media import * from files.helpers.const import * from files.classes.casino_game import Casino_Game diff --git a/files/helpers/actions.py b/files/helpers/actions.py index 94864b4ba..9dc27aa6a 100644 --- a/files/helpers/actions.py +++ b/files/helpers/actions.py @@ -9,6 +9,15 @@ from urllib.parse import quote headers = {'User-Agent': 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'} +SNAPPY_MARSEYS = [] +if SITE_NAME != 'PCM': + SNAPPY_MARSEYS = [f':#{x}:' for x in marseys_const2] + +SNAPPY_QUOTES = [] +if path.isfile(f'snappy_{SITE_NAME}.txt'): + with open(f'snappy_{SITE_NAME}.txt', "r", encoding="utf-8") as f: + SNAPPY_QUOTES = f.read().split("\n{[para]}\n") + def archiveorg(url): try: requests.get(f'https://web.archive.org/save/{url}', headers=headers, timeout=10, proxies=proxies) except: pass diff --git a/files/helpers/cloudflare.py b/files/helpers/cloudflare.py index 4e41712c1..396464e23 100644 --- a/files/helpers/cloudflare.py +++ b/files/helpers/cloudflare.py @@ -1,14 +1,16 @@ import json from typing import List, Union, Optional -from files.helpers.const import * +from files.helpers.const import CF_HEADERS, CF_ZONE import requests CLOUDFLARE_API_URL = "https://api.cloudflare.com/client/v4" CLOUDFLARE_REQUEST_TIMEOUT_SECS = 5 DEFAULT_CLOUDFLARE_ZONE = 'blahblahblah' +CLOUDFLARE_AVAILABLE = CF_ZONE and CF_ZONE != DEFAULT_CLOUDFLARE_ZONE + def _request_from_cloudflare(url:str, method:str, post_data_str) -> bool: - if CF_ZONE == DEFAULT_CLOUDFLARE_ZONE: return False + if not CLOUDFLARE_AVAILABLE: return False try: res = str(requests.request(method, f"{CLOUDFLARE_API_URL}/zones/{CF_ZONE}/{url}", headers=CF_HEADERS, data=post_data_str, timeout=CLOUDFLARE_REQUEST_TIMEOUT_SECS)) except: @@ -26,11 +28,11 @@ def get_security_level() -> Optional[str]: def set_security_level(under_attack="high") -> bool: return _request_from_cloudflare("settings/security_level", "PATCH", f'{{"value":"{under_attack}"}}') -def clear_cloudflare_cache() -> bool: +def clear_entire_cache() -> bool: return _request_from_cloudflare("purge_cache", "POST", '{"purge_everything":true}') def purge_files_in_cache(files:Union[List[str],str]) -> bool: - if CF_ZONE == DEFAULT_CLOUDFLARE_ZONE: return False + if not CLOUDFLARE_AVAILABLE: return False if isinstance(files, str): files = [files] post_data = {"files": files} diff --git a/files/helpers/const.py b/files/helpers/const.py index 97753b530..4274002eb 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -2,9 +2,6 @@ from os import environ import re from copy import deepcopy from json import loads -from files.__main__ import db_session -from files.classes.sub import Sub -from files.classes.marsey import Marsey from flask import request import tldextract from os import path @@ -54,6 +51,8 @@ if PUSHER_ID != "blahblahblah": CONTENT_SECURITY_POLICY_DEFAULT = "script-src 'self' 'unsafe-inline' ajax.cloudflare.com; connect-src 'self'; object-src 'none';" CONTENT_SECURITY_POLICY_HOME = f"script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self' tls-use1.fpapi.io api.fpjs.io{PUSHER_ID_CSP}; object-src 'none';" +CLOUDFLARE_COOKIE_VALUE = "yes." + if SITE == "localhost": SITE_FULL = 'http://' + SITE else: SITE_FULL = 'https://' + SITE @@ -1407,34 +1406,10 @@ christian_emojis = [':#marseyjesus:',':#marseyimmaculate:',':#marseymothermary:' ':#marseycrucified:',':#chadjesus:',':#marseyandjesus:',':#marseyjesus2:', ':#marseyorthodoxsmug:',':#marseypastor:',':#marseypope:',] -db = db_session() -marseys_const = [x[0] for x in db.query(Marsey.name).filter(Marsey.submitter_id==None, Marsey.name!='chudsey').all()] -marseys_const2 = marseys_const + ['chudsey','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','0','1','2','3','4','5','6','7','8','9','exclamationpoint','period','questionmark'] - -marseys = db.query(Marsey).filter(Marsey.submitter_id==None).all() -marsey_mappings = {} -for marsey in marseys: - for tag in marsey.tags.split(): - if tag in marsey_mappings: - marsey_mappings[tag].append(marsey.name) - else: - marsey_mappings[tag] = [marsey.name] -db.close() - -SNAPPY_MARSEYS = [] -if SITE_NAME != 'PCM': - SNAPPY_MARSEYS = [f':#{x}:' for x in marseys_const2] - -SNAPPY_QUOTES = [] -if path.isfile(f'snappy_{SITE_NAME}.txt'): - with open(f'snappy_{SITE_NAME}.txt', "r", encoding="utf-8") as f: - SNAPPY_QUOTES = f.read().split("\n{[para]}\n") - ADMIGGER_THREADS = {SIDEBAR_THREAD, BANNER_THREAD, BADGE_THREAD, SNAPPY_THREAD} proxies = {"http":PROXY_URL,"https":PROXY_URL} - approved_embed_hosts = { SITE, 'rdrama.net', diff --git a/files/helpers/marsify.py b/files/helpers/marsify.py index 09feceeb1..2cefb765a 100644 --- a/files/helpers/marsify.py +++ b/files/helpers/marsify.py @@ -1,4 +1,4 @@ -from .const import marsey_mappings +from .sanitize import marsey_mappings from random import choice def marsify(text): diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 58042857e..cea4980f6 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -5,14 +5,27 @@ from bleach.css_sanitizer import CSSSanitizer from bleach.linkifier import LinkifyFilter from functools import partial from .get import * -from os import path, environ +from os import path import re from mistletoe import markdown -from json import loads, dump from random import random, choice import signal -import time -import requests +from files.__main__ import db_session +from files.classes.marsey import Marsey + +db = db_session() +marseys_const = [x[0] for x in db.query(Marsey.name).filter(Marsey.submitter_id==None, Marsey.name!='chudsey').all()] +marseys_const2 = marseys_const + ['chudsey','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','0','1','2','3','4','5','6','7','8','9','exclamationpoint','period','questionmark'] + +marseys = db.query(Marsey).filter(Marsey.submitter_id==None).all() +marsey_mappings = {} +for marsey in marseys: + for tag in marsey.tags.split(): + if tag in marsey_mappings: + marsey_mappings[tag].append(marsey.name) + else: + marsey_mappings[tag] = [marsey.name] +db.close() TLDS = ( # Original gTLDs and ccTLDs 'ac','ad','ae','aero','af','ag','ai','al','am','an','ao','aq','ar','arpa','as','asia','at', diff --git a/files/helpers/wrappers.py b/files/helpers/wrappers.py index f77172816..a6183daf3 100644 --- a/files/helpers/wrappers.py +++ b/files/helpers/wrappers.py @@ -3,6 +3,7 @@ from .alerts import * from files.helpers.const import * from files.helpers.get import * from files.__main__ import db_session, limiter +from flask import g, request from random import randint import functools import user_agents @@ -32,6 +33,7 @@ def calc_users(v): def get_logged_in_user(): if hasattr(g, 'v'): return g.v if not (hasattr(g, 'db') and g.db): g.db = db_session() + g.desires_auth = True v = None token = request.headers.get("Authorization","").strip() if token: @@ -64,7 +66,6 @@ def get_logged_in_user(): if request.method.lower() != "get" and app.config['SETTINGS']['Read-only mode'] and not (v and v.admin_level >= PERMS['SITE_BYPASS_READ_ONLY_MODE']): abort(403) - g.v = v if v: @@ -98,21 +99,12 @@ def auth_desired_with_logingate(f): v = get_logged_in_user() if app.config['SETTINGS']['login_required'] and not v: abort(401) - #### WPD TEMP #### disable this /logged_out thing on .co - if SITE == 'watchpeopledie.co': - return make_response(f(*args, v=v, **kwargs)) - #### END WPD TEMP #### - - 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'): + if request.path.startswith('/logged_out'): redir = request.full_path.replace('/logged_out','') if not redir: redir = '/' return redirect(redir) return make_response(f(*args, v=v, **kwargs)) - wrapper.__name__ = f.__name__ return wrapper @@ -120,9 +112,7 @@ def auth_required(f): def wrapper(*args, **kwargs): v = get_logged_in_user() if not v: abort(401) - return make_response(f(*args, v=v, **kwargs)) - wrapper.__name__ = f.__name__ return wrapper diff --git a/files/routes/__init__.py b/files/routes/__init__.py index f8654050d..deeecc4f5 100644 --- a/files/routes/__init__.py +++ b/files/routes/__init__.py @@ -1,3 +1,7 @@ +# import classes then... +from files.classes.sub import Sub + +# import routes from .admin import * from .comments import * from .errors import * diff --git a/files/routes/admin.py b/files/routes/admin.py index 3d4799770..b5bf42ba8 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -478,7 +478,7 @@ def change_settings(v, setting): @app.post("/admin/clear_cloudflare_cache") @admin_level_required(PERMS['SITE_CACHE_PURGE_CDN']) def clear_cloudflare_cache(v): - if not cloudflare.clear_cloudflare_cache(): + if not cloudflare.clear_entire_cache(): abort(400, 'Failed to clear cloudflare cache!') ma = ModAction( kind="clear_cloudflare_cache", @@ -1150,7 +1150,7 @@ def remove_post(post_id, v): v.coins += 1 g.db.add(v) - cloudflare.purge_files_in_cache(f"https://{SITE}/logged_out") + cloudflare.purge_files_in_cache(f"https://{SITE}/") return {"message": "Post removed!"} diff --git a/files/routes/comments.py b/files/routes/comments.py index 408ec9049..e77a88e98 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -28,10 +28,6 @@ WORDLE_COLOR_MAPPINGS = {-1: "🟥", 0: "🟨", 1: "🟩"} @app.get("/post///") @app.get("/h//comment/") @app.get("/h//post///") -@app.get("/logged_out/comment/") -@app.get("/logged_out/post///") -@app.get("/logged_out/h//comment/") -@app.get("/logged_out/h//post///") @auth_desired_with_logingate def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): comment = get_comment(cid, v=v) diff --git a/files/routes/front.py b/files/routes/front.py index 33750449a..bdc9df4eb 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -9,9 +9,6 @@ from files.helpers.awards import award_timers @app.get("/") @app.get("/h/") @app.get("/s/") -@app.get("/logged_out") -@app.get("/logged_out/h/") -@app.get("/logged_out/s/") @limiter.limit("3/second;30/minute;5000/hour;10000/day") @auth_desired_with_logingate def front_all(v, sub=None, subdomain=None): @@ -22,9 +19,9 @@ def front_all(v, sub=None, subdomain=None): if SITE == 'watchpeopledie.co': if v and not v.admin_level and not v.id <= 9: # security: don't auto login admins or bots hash = generate_hash(f'{v.id}+{now.year}+{now.month}+{now.day}+{now.hour}+WPDusermigration') - return redirect(f'https://watchpeopledie.tv/logged_out?user={v.id}&code={hash}', 301) + return redirect(f'https://watchpeopledie.tv/?user={v.id}&code={hash}', 301) else: - return redirect('https://watchpeopledie.tv/logged_out', 301) + return redirect('https://watchpeopledie.tv/', 301) elif SITE == 'watchpeopledie.tv' and not v: # security: don't try to login people into accounts more than once req_user = request.values.get('user') req_code = request.values.get('code') @@ -37,8 +34,7 @@ def front_all(v, sub=None, subdomain=None): else: if validate_hash(f'{user.id}+{now.year}+{now.month}+{now.day}+{now.hour}+WPDusermigration', req_code): on_login(user) - return redirect('/') - return redirect('/logged_out') + return redirect('/') #### WPD TEMP #### end special front logic if sub: sub = sub.strip().lower() diff --git a/files/routes/login.py b/files/routes/login.py index fcd9ceebb..b5db19564 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -12,9 +12,8 @@ import secrets @auth_desired def login_get(v): - redir = request.values.get("redirect", "/") + redir = request.values.get("redirect", "/").strip().rstrip('?') if redir: - redir = redir.replace("/logged_out", "").strip().rstrip('?') if not is_site_url(redir): redir = "/" if v: return redirect(redir) @@ -149,9 +148,8 @@ def login_post(): g.login_failed = False on_login(account) - redir = request.values.get("redirect") + redir = request.values.get("redirect", "").strip().rstrip('?') if redir: - redir = redir.replace("/logged_out", "").strip().rstrip('?') if is_site_url(redir): return redirect(redir) return redirect('/') @@ -229,9 +227,8 @@ def sign_up_get(v): error = request.values.get("error") - redir = request.values.get("redirect", "/") + redir = request.values.get("redirect", "/").strip().rstrip('?') if redir: - redir = redir.replace("/logged_out", "").strip().rstrip('?') if not is_site_url(redir): redir = "/" return render_template("sign_up.html", @@ -388,9 +385,8 @@ def sign_up_post(v): elif CARP_ID: send_notification(CARP_ID, f"A new user - @{new_user.username} - has signed up!") - redir = request.values.get("redirect") + redir = request.values.get("redirect", "").strip().rstrip('?') if redir: - redir = redir.replace("/logged_out", "").strip().rstrip('?') if is_site_url(redir): return redirect(redir) return redirect('/') diff --git a/files/routes/posts.py b/files/routes/posts.py index 567f874c8..6b2ff4484 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -130,10 +130,6 @@ def submit_get(v, sub=None): @app.get("/post//") @app.get("/h//post/") @app.get("/h//post//") -@app.get("/logged_out/post/") -@app.get("/logged_out/post//") -@app.get("/logged_out/h//post/") -@app.get("/logged_out/h//post//") @auth_desired_with_logingate def post_id(pid, anything=None, v=None, sub=None): post = get_post(pid, v=v) diff --git a/files/routes/static.py b/files/routes/static.py index f01f8e812..c1810aa99 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -401,7 +401,6 @@ if not os.path.exists(f'files/templates/donate_{SITE_NAME}.html'): copyfile(f'files/templates/donate_rDrama.html', f'files/templates/donate_{SITE_NAME}.html') @app.get('/donate') -@app.get('/logged_out/donate') @auth_desired_with_logingate def donate(v): return render_template(f'donate_{SITE_NAME}.html', v=v) @@ -507,7 +506,6 @@ if SITE == 'pcmemes.net': @app.get('/live') - @app.get('/logged_out/live') @auth_desired_with_logingate def live_list(v): live = cache.get('live') or [] diff --git a/files/routes/users.py b/files/routes/users.py index 0c43667b5..58fa5811a 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -666,7 +666,6 @@ def visitors(v): @app.get("/@") @app.get("/@.json") -@app.get("/logged_out/@") @auth_desired_with_logingate def u_username(username, v=None): u = get_user(username, v=v, include_blocks=True, include_shadowbanned=False) @@ -747,7 +746,6 @@ def u_username(username, v=None): @app.get("/@/comments") @app.get("/@/comments.json") -@app.get("/logged_out/@/comments") @auth_desired_with_logingate def u_username_comments(username, v=None): u = get_user(username, v=v, include_blocks=True, include_shadowbanned=False) @@ -915,9 +913,6 @@ def remove_follow(username, v): @app.get("/pp/") @app.get("/uid//pic") @app.get("/uid//pic/profile") -@app.get("/logged_out/pp/") -@app.get("/logged_out/uid//pic") -@app.get("/logged_out/uid//pic/profile") @cache.memoize(timeout=86400) @limiter.exempt def user_profile_uid(id): diff --git a/files/templates/header.html b/files/templates/header.html index f3e192233..0640ace0f 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -268,7 +268,7 @@ {% else %}
  • - Donate + Donate
  • Contact us @@ -336,7 +336,7 @@
    • {% else %}
  • - Donate + Donate
  • Contact us diff --git a/files/templates/home.html b/files/templates/home.html index 7cdf01e26..48aa19761 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -184,7 +184,7 @@ {% endif %} -{% if request.path in ('/','/logged_out') and time.time() > session.get('tooltip_last_dismissed',0)+60*60*24*30 and not g.webview %} +{% if request.path == '/' and time.time() > session.get('tooltip_last_dismissed',0)+60*60*24*30 and not g.webview %}