From 816389cf28749bd055a9dc4af32538a9ecea5bc2 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 25 Nov 2022 07:10:05 -0600 Subject: [PATCH 01/16] security: fix DoS on title getter the `timeout` parameter only applies to seconds per *byte* received (and time to first byte), not the entire request this means an attacker could theoretically send a very... slow... stream... of... bytes... and... crash... the... worker... when... the... timeout... is... reached... --- files/routes/posts.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index e145c9002..a6068efbd 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -1075,6 +1075,7 @@ extensions = IMAGE_FORMATS + VIDEO_FORMATS + AUDIO_FORMATS @ratelimit_user("3/minute") @auth_required def get_post_title(v): + POST_TITLE_TIMEOUT = 5 url = request.values.get("url") if not url or '\\' in url: abort(400) url = url.strip() @@ -1084,7 +1085,8 @@ def get_post_title(v): if any((checking_url.endswith(f'.{x}') for x in extensions)): abort(400) - try: x = requests.get(url, headers=titleheaders, timeout=5, proxies=proxies) + try: + x = gevent.with_timeout(POST_TITLE_TIMEOUT, requests.get, url, headers=titleheaders, timeout=POST_TITLE_TIMEOUT, proxies=proxies) except: abort(400) content_type = x.headers.get("Content-Type") From 61a4ab4f39a73cbfcf31a89df3bd4fe4f3147fc8 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 25 Nov 2022 11:49:37 -0600 Subject: [PATCH 02/16] css: fix alignment on ghost posts --- files/assets/css/main.css | 5 +++++ files/templates/submission.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 959ff605c..7d02c39a6 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -3528,6 +3528,11 @@ small, .small { .post-meta::-webkit-scrollbar { display: none; } + +.ghost-post .post-meta { + height: 30px; +} + .sub-flair { padding: 3px 5px 2px 5px; border-radius: 5px; diff --git a/files/templates/submission.html b/files/templates/submission.html index a489f3343..b99139730 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -78,7 +78,7 @@
-
+
{% if not p.is_image and p.thumb_url and not p.embed_url %}
From 23505c68b360732836988e37092dcedc3ec90d52 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 25 Nov 2022 12:27:18 -0600 Subject: [PATCH 03/16] errors: use abort for sign up errors --- files/routes/login.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/routes/login.py b/files/routes/login.py index 6cd003703..1b368e041 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -151,7 +151,7 @@ def logout(v): @auth_desired def sign_up_get(v): if not get_setting('Signups'): - return {"error": "New account registration is currently closed. Please come back later."}, 403 + abort(403, "New account registration is currently closed. Please come back later.") if v: return redirect(SITE_FULL) @@ -201,7 +201,7 @@ def sign_up_get(v): @auth_desired def sign_up_post(v): if not get_setting('Signups'): - return {"error": "New account registration is currently closed. Please come back later."}, 403 + abort(403, "New account registration is currently closed. Please come back later.") if v: abort(403) From 37c8d77f3f790692723f12e6a4bcd204d94b5174 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 25 Nov 2022 13:18:43 -0600 Subject: [PATCH 04/16] submit: don't disable submit button by default this doesn't create an issue because HTML form validation does work here --- files/templates/submit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/submit.html b/files/templates/submit.html index 67ae18674..13d587f5d 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -105,7 +105,7 @@
{% if error %}{{error | safe}}{% endif %} - +
From 887f2e62a17cfd209dbbbc8beae63f4e44b2f6d1 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 21:34:12 +0200 Subject: [PATCH 05/16] remove sitemap.xml --- files/assets/sitemap.xml | 2013 -------------------------------------- 1 file changed, 2013 deletions(-) delete mode 100644 files/assets/sitemap.xml diff --git a/files/assets/sitemap.xml b/files/assets/sitemap.xml deleted file mode 100644 index 956da5b3d..000000000 --- a/files/assets/sitemap.xml +++ /dev/null @@ -1,2013 +0,0 @@ - - - - - https://rdrama.net - 2022-06-10T23:42:26+00:00 - 1.00 - - - https://rdrama.net/post/19236/ - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/contact - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/signup - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fmarseys%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fbadges%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Flog%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Ftransfers%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Frandom_user%2F%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Frandom_post%2F%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fcomments%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/holes - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/16583 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/18459 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75878 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/33652 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/35835 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/37677 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/39413 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/19711/a-short-guide-on-how-to - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=hour - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=week - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=month - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=year - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=all - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=bump&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=top&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=bottom&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=new&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=old&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=controversial&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=comments&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75837/dramafitness-megathread-9-the-biggining-of - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75837 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Atwitter.com%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75977/india-is-currently-feuding-with-the - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75977 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Awsj.com%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75950/grift-zero-of-the-adderall-epidemic - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75950 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75959/twitter-marseytrain-activates-the-nuclear-option - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75959 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75968/marseylove-love-for-metadrama-marseylove - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75968 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/6345 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/5800 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/2663 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/8494 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Areddit.com%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75957/they-hated-her-because-she-told - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75957 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75945/who-factchecks-the-factchecker - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75945 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/76001/scrotes-are-so-fucking-pathetic-omg - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_76001 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Ardrama.net%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75914/gentlemen-ladies-after-a-month-of - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75914 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/58808/alright-dramatards-time-to-vote-marseyridin - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/5526 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75921/this-schizosorenspam-shit-is-annoying-and - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75921 - 2022-06-10T23:42:26+00:00 - 0.80 - - - 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/id/1376 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/2546 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/10092 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/3511 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/560 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/636 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/541 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/4003 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/9334 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/5188 - 2022-06-10T23:42:26+00:00 - 0.80 - - - 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/h/schizocel - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75884 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75989/foid-refused-mandatory-sympathy-while-posting - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75989 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75987/tw-i-need-to-get-a - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75987 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75976/internal-server-error - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75976 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/braincels - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75897/jokers-2-is-confirmed - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75994/i-really-love-marseyismywaifu - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75994 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75931/marseyklennyclap - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75931 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75899/do-not-forgive-do-not-forget - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75899 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75913/just-found-out-that-im-trans - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75913 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75981/you-dont-want-to-try-anything - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75981 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75820/what-do-most-people-not-realize - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75820 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Abbc.co.uk%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75819/terf-islanders-decide-theyd-rather-die - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75819 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75815/trans-allies-get-what-they-asked - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75815 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/anime - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/anime/post/75831/this-is-cirno - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75831 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/7813 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/296 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1994 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/9397 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1357 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/8654 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1203 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/7466 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/7580 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/3016 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/9755 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/5099 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/7615 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/10272 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/9287 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/10881 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1378 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1387 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Adailymail.co.uk%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75847/terf-island-people-study-disturbing-moment - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75847 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75943/serious-question-is-russia-winning-the - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75943 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/30 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/76000/marseymuhammad-pbuh - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_76000 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&page=2&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=new&t=all - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fleaderboard%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=/post/19236/ - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_19236 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/?sort=bottom - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/?sort=new - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/?sort=old - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/?sort=controversial - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_477392 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/477392?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fformatting%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_477413 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/477413?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478434 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478434?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475015 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475015?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475051 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475051?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475057 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475057?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475105 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475105?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475734 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475734?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475737 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475737?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475766 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475766?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475773 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475773?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475949 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475949?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_476002 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476002?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476002 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475919 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478275 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478275?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478149 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478149?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478992 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478992?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_479126 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479126?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_479546 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479546?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478895 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478895?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475025 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475025?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475043 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475043?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475068 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475068?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475084 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475084?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475089 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475089?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475097 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475097?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475112 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475112?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475220 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475220?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475026 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475026?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475027 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475028 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475028?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475035 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475035?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475085 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475085?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475044 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475044?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475081 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475081?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475140 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475140?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475215 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475215?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_1892325 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1892325?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_1892423 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1892423?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_1894344 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1894344?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475036 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475036?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475134 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475134?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475717 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475717?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_479427 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479427?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_476009 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476009?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475038 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475118 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475118?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475159 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475159?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475304 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475304?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475082 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475082?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475325 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475325?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_476597 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476597?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/60443/ - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=hour - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=week - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=month - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=year - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=all - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=bump&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=top&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=bottom&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=new&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=old&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=controversial&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=comments&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&page=2&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/forgot - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/contact? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/marseys? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/badges? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/log? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/transfers? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/random_user/? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/random_post/? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/comments? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/64305/ - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=/holes - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/furry - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Ffurry%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Ffurry%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/moemorphism - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fmoemorphism%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fmoemorphism%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/music - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fmusic%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fmusic%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/random - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Frandom%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Frandom%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fschizocel%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fschizocel%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fanime%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fanime%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/dankchristianmemes - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fdankchristianmemes%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fdankchristianmemes%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/slackernews - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fslackernews%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fslackernews%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/ducks - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fducks%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fducks%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/eevee - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Feevee%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Feevee%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/borgar - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fborgar%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fborgar%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/shrek_dick_dimension - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fshrek_dick_dimension%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fshrek_dick_dimension%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/carpathianflorist - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fcarpathianflorist%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fcarpathianflorist%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_16583 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583?sort=top - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583?sort=bottom - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583?sort=old - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583?sort=controversial - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2099220 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2099220?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2098425 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2098425?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2099170 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2099170?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2098186 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2098186?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097709 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2097709?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2096229 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2096229?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2094034 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2094034?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2093551 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2093551?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2087416 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2087416?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2086725 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2086725?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2084709 - 2022-06-10T23:42:26+00:00 - 0.64 - - - 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=/post/18459 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_18459 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459?sort=top - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459?sort=bottom - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459?sort=old - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459?sort=controversial - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2099175 - 2022-06-10T23:42:26+00:00 - 0.64 - - - 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/post/75637/changelog-hole-improvements-follow-holes-for/2091847?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2093336 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2093336?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2090949 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2090949?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2091000 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091000?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2089369 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2089369?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2089221 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2089221?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2088542 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2088542?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2088023 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2088023?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2086651 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2086651?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2086711 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2086711?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2091665 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091665?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2091794 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091794?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2080052 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=/post/75878 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75878 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878?sort=top - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878?sort=bottom - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878?sort=old - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878?sort=controversial - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097292 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097292?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097440 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097440?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097510 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097510?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097560 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097560?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097768 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097768?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097794 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097794?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097830 - 2022-06-10T23:42:26+00:00 - 0.64 - - - 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/id/4284 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097659 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097659?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097668 - 2022-06-10T23:42:26+00:00 - 0.64 - - - 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/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097707?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - 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/post/75878/megathread-post-your-favourite-rdramathemed-oc/2098316?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - 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/post/75878/megathread-post-your-favourite-rdramathemed-oc/2099121?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - 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/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097681?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097537?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - From feb7fc2cf46dd31bce6510e796e7f1c69f6d6d37 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 21:35:13 +0200 Subject: [PATCH 06/16] fix 61a4ab4f39 --- files/templates/submission_listing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index a406159e6..0ddb842ef 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -45,7 +45,7 @@
{% endif %} -
+
From f672037021d4debc8978d6e78196c62ea94eeb6e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 21:36:09 +0200 Subject: [PATCH 07/16] remove lmbo profanity filter --- files/helpers/const.py | 1 - 1 file changed, 1 deletion(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index a1f3d64d5..c0c0158ae 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -153,7 +153,6 @@ PROFANITIES = { 'fuck': 'frick', ' ass ': ' butt ', 'shitting': 'pooping', - 'lmao': 'lmbo', 'damn': 'darn', 'bastard': 'fatherless child', 'bitch': 'b-word', From 3dee4afa6f3f6c939d6ad3b2fae6d91a8c31c299 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 21:36:37 +0200 Subject: [PATCH 08/16] make "snekchad" ping sneks --- files/helpers/const.py | 1 + 1 file changed, 1 insertion(+) diff --git a/files/helpers/const.py b/files/helpers/const.py index c0c0158ae..1617fb198 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -1397,6 +1397,7 @@ NOTIFIED_USERS = { 'snakes': SNAKES_ID, 'sneks': SNAKES_ID, 'snekky': SNAKES_ID, + 'snekchad': SNAKES_ID, 'jc': JUSTCOOL_ID, 'justcool': JUSTCOOL_ID, 'geese': GEESE_ID, From aeb1916b0136e937d3f0c4ccb490390e57d9231b Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 25 Nov 2022 14:11:34 -0600 Subject: [PATCH 09/16] tests: it never worked anyway --- run_tests.py | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100755 run_tests.py diff --git a/run_tests.py b/run_tests.py deleted file mode 100755 index 2b3ca6193..000000000 --- a/run_tests.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/python3 - -import subprocess -import sys - -# we want to leave the container in whatever state it currently is, so check to see if it's running -docker_inspect = subprocess.run([ - "docker", - "container", - "inspect", - "-f", "{{.State.Status}}", - "rDrama", - ], - capture_output = True, - ).stdout.decode("utf-8").strip() - -was_running = docker_inspect == "running" - -# update containers, just in case they're out of date -if was_running: - print("Updating containers . . .", flush=True) -else: - print("Starting containers . . .", flush=True) -subprocess.run([ - "docker-compose", - "up", - "--build", - "-d", - ], - check = True, - ) - -# run the test -print("Running test . . .", flush=True) -result = subprocess.run([ - "docker", - "exec", - "rDrama", - "bash", "-c", "cd service && python3 -m pytest -s" - ]) - -if not was_running: - # shut down, if we weren't running in the first place - print("Shutting down containers . . .", flush=True) - subprocess.run([ - "docker-compose", - "stop", - ], - check = True, - ) - -sys.exit(result.returncode) From 0356c589a47df668f5ac66700bf4895f89ed5174 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 25 Nov 2022 14:31:07 -0600 Subject: [PATCH 10/16] api: don't hit calc_users if this is the API sometimes we render HTML where we probably... shouldn't. in most cases this is fine, but if API clients hit it it can errenously set --- files/routes/wrappers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/files/routes/wrappers.py b/files/routes/wrappers.py index 7a979058e..caf13c5c7 100644 --- a/files/routes/wrappers.py +++ b/files/routes/wrappers.py @@ -18,6 +18,7 @@ def session_init(): session["session_id"] = secrets.token_hex(49) def calc_users(v): + if g.is_api_or_xhr: return loggedin = cache.get(f'{SITE}_loggedin') or {} loggedout = cache.get(f'{SITE}_loggedout') or {} timestamp = int(time.time()) From 86cea2302e7859b51d965de894af8580799733c9 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 22:34:53 +0200 Subject: [PATCH 11/16] fix github url in bard snappy quote --- snappy_rDrama.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index 012bcd492..37e6d66ab 100644 --- a/snappy_rDrama.txt +++ b/snappy_rDrama.txt @@ -2993,7 +2993,7 @@ https://media.giphy.com/media/3oz8xLd9DJq2l2VFtu/giphy.webp {[para]} Rape {[para]} -Here is the Contributors listing for the github project: https://github.com/Aevann1/rDrama +Here is the Contributors listing for the github project: https://fsdfsd.net/rDrama/rDrama/activity That list shows CarpathianFlorist as a contributor. CarpathianFlorist is a Racially Motivated Violent Extremist - a White Identity Extremist - who was involved in /r/MillionDollarExtreme and its many hundreds of spinoffs and descendants. I've collected dozens of his Reddit accts. @@ -3173,4 +3173,4 @@ Normies can't understand the thrill of pinning the Weasel. Night spent chasing a {[para]} I am the “office manager” of AHS. I’ve spent the past three years keeping spreadsheets and have inboxes full of ticket closures, and have written reports characterizing the response accuracy of Reddit AEO. -Would you like to escalate and mansplain my field of expertise to me more? \ No newline at end of file +Would you like to escalate and mansplain my field of expertise to me more? From 2938f930fd689f3653d990de417fef1ee6c0a178 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 22:56:11 +0200 Subject: [PATCH 12/16] make me not see modmail, if its important the other jannies will tell me --- files/routes/static.py | 4 +--- files/routes/users.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index 6c90bc49f..975b7d820 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -235,9 +235,7 @@ def submit_contact(v): execute_blackjack(v, new_comment, new_comment.body_html, 'modmail') new_comment.top_comment_id = new_comment.id - admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL']) - if SITE == 'watchpeopledie.tv': - admins = admins.filter(User.id != AEVANN_ID) + admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != AEVANN_ID) for admin in admins.all(): notif = Notification(comment_id=new_comment.id, user_id=admin.id) diff --git a/files/routes/users.py b/files/routes/users.py index 605cc1178..09e1373b3 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -550,9 +550,7 @@ def messagereply(v): top_comment = c.top_comment(g.db) if top_comment.sentto == MODMAIL_ID: - admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id) - if SITE == 'watchpeopledie.tv': - admins = admins.filter(User.id != AEVANN_ID) + admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id, User.id != AEVANN_ID) admins = [x[0] for x in admins.all()] From c5446b3a39eca25c5b64fe792cdeae6ff3d264b2 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 23:01:35 +0200 Subject: [PATCH 13/16] do this https://rdrama.life/post/125878/colorado-shooter-proves-his-idpol-credentials/3129042?context=8#context --- files/helpers/const.py | 1 + 1 file changed, 1 insertion(+) diff --git a/files/helpers/const.py b/files/helpers/const.py index 1617fb198..43cc3c0a1 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -145,6 +145,7 @@ if SITE_NAME == 'rDrama': "kys ": "keep yourself safe ", "republican": 'republiKKKan', "america": 'ameriKKKa', + "it's almost as if": "I'm a retard but", } SLURS.update(RDRAMA_SLURS) From e4b521a63fe56ba000199bf4356c9e45e2544642 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 23:33:38 +0200 Subject: [PATCH 14/16] limit polls to 10 options to prevent spam --- files/routes/comments.py | 8 ++++---- files/routes/posts.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/files/routes/comments.py b/files/routes/comments.py index 5dc148383..7c71fc6b6 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -132,12 +132,12 @@ def comment(v): abort(403, "You can't reply to users who have blocked you or users that you have blocked.") options = [] - for i in poll_regex.finditer(body): + for i in list(poll_regex.finditer(body))[:10]: options.append(i.group(1)) body = body.replace(i.group(0), "") choices = [] - for i in choice_regex.finditer(body): + for i in list(choice_regex.finditer(body))[:10]: choices.append(i.group(1)) body = body.replace(i.group(0), "") @@ -390,7 +390,7 @@ def edit_comment(cid, v): elif v.bird and len(body) > 140: abort(403, "You have to type less than 140 characters!") - for i in poll_regex.finditer(body): + for i in list(poll_regex.finditer(body))[:10]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") @@ -401,7 +401,7 @@ def edit_comment(cid, v): ) g.db.add(option) - for i in choice_regex.finditer(body): + for i in list(choice_regex.finditer(body))[:10]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") diff --git a/files/routes/posts.py b/files/routes/posts.py index a6068efbd..987eabdad 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -360,7 +360,7 @@ def edit_post(pid, v): ) g.db.add(bet) - for i in poll_regex.finditer(body): + for i in list(poll_regex.finditer(body))[:10]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") @@ -371,7 +371,7 @@ def edit_post(pid, v): ) g.db.add(option) - for i in choice_regex.finditer(body): + for i in list(choice_regex.finditer(body))[:10]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") @@ -754,12 +754,12 @@ def submit_post(v, sub=None): body = body.replace(i.group(0), "") options = [] - for i in poll_regex.finditer(body): + for i in list(poll_regex.finditer(body))[:10]: options.append(i.group(1)) body = body.replace(i.group(0), "") choices = [] - for i in choice_regex.finditer(body): + for i in list(choice_regex.finditer(body))[:10]: choices.append(i.group(1)) body = body.replace(i.group(0), "") From f86d351ac484a528df3bda41aa043c17bf645770 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 25 Nov 2022 15:43:35 -0600 Subject: [PATCH 15/16] fix saved subscribers stuff --- files/classes/user.py | 24 +++++++++++++++++++++--- files/helpers/get.py | 14 +++++++++----- files/routes/users.py | 11 ++++++++--- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index a04966a66..4853538c5 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -873,6 +873,24 @@ class User(Base): def userblocks(self): return [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=self.id).all()] + def get_relationship_count(self, relationship_cls): + # TODO: deduplicate (see routes/users.py) + if relationship_cls in [SaveRelationship, Subscription]: + query = relationship_cls.submission_id + join = relationship_cls.post + cls = Submission + elif relationship_cls is CommentSaveRelationship: + query = relationship_cls.comment_id + join = relationship_cls.comment + cls = Comment + else: + raise TypeError("Relationships supported is SaveRelationship, Subscription, CommentSaveRelationship") + + query = g.db.query(query).join(join).filter(relationship_cls.user_id == self.id) + if not self.admin_level >= PERMS['POST_COMMENT_MODERATION']: + query = query.filter(cls.is_banned == False, cls.deleted_utc == 0) + return query.count() + @property @lazy def saved_idlist(self): @@ -895,17 +913,17 @@ class User(Base): @property @lazy def saved_count(self): - return g.db.query(SaveRelationship).filter_by(user_id=self.id).count() + return self.get_relationship_count(SaveRelationship) @property @lazy def saved_comment_count(self): - return g.db.query(CommentSaveRelationship).filter_by(user_id=self.id).count() + return self.get_relationship_count(CommentSaveRelationship) @property @lazy def subscribed_count(self): - return g.db.query(Subscription).filter_by(user_id=self.id).count() + return self.get_relationship_count(Subscription) @property @lazy diff --git a/files/helpers/get.py b/files/helpers/get.py index 33ec03736..a2c1d8a9b 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -2,7 +2,7 @@ from typing import Callable, Iterable, List, Optional, Union from flask import * from sqlalchemy import and_, any_, or_ -from sqlalchemy.orm import joinedload, selectinload +from sqlalchemy.orm import joinedload, selectinload, Query from files.classes import Comment, CommentVote, Hat, Sub, Submission, User, UserBlock, Vote from files.helpers.const import AUTOJANNY_ID @@ -145,7 +145,7 @@ def get_post(i:Union[str, int], v:Optional[User]=None, graceful=False) -> Option return x -def get_posts(pids:Iterable[int], v:Optional[User]=None, eager:bool=False) -> List[Submission]: +def get_posts(pids:Iterable[int], v:Optional[User]=None, eager:bool=False, extra:Optional[Callable[[Query], Query]]=None) -> List[Submission]: if not pids: return [] if v: @@ -178,6 +178,8 @@ def get_posts(pids:Iterable[int], v:Optional[User]=None, eager:bool=False) -> Li else: query = g.db.query(Submission).filter(Submission.id.in_(pids)) + if extra: query = extra(query) + if eager: query = query.options( selectinload(Submission.author).options( @@ -276,12 +278,14 @@ def add_vote_and_block_props(target:Union[Submission, Comment], v:Optional[User] target = add_block_props(target, v) return add_vote_props(target, v, vote_cls) -def get_comments(cids:Iterable[int], v:Optional[User]=None) -> List[Comment]: +def get_comments(cids:Iterable[int], v:Optional[User]=None, extra:Optional[Callable[[Query], Query]]=None) -> List[Comment]: if not cids: return [] if v: - output = get_comments_v_properties(v, True, None, Comment.id.in_(cids))[1] + output = get_comments_v_properties(v, True, None, Comment.id.in_(cids))[1] # TODO: support 'extra' for get_comments_v_properties else: - output = g.db.query(Comment).join(Comment.author).filter(User.shadowbanned == None, Comment.id.in_(cids)).all() + output = g.db.query(Comment).join(Comment.author) + if extra: output = extra(output) + output = output.filter(User.shadowbanned == None, Comment.id.in_(cids)).all() return sorted(output, key=lambda x: cids.index(x.id)) def get_comments_v_properties(v:User, include_shadowbanned=True, should_keep_func:Optional[Callable[[Comment], bool]]=None, *criterion): diff --git a/files/routes/users.py b/files/routes/users.py index 09e1373b3..086ee9e25 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -935,7 +935,6 @@ def user_profile_name(username): return redirect(x.profile_url) def get_saves_and_subscribes(v, template, relationship_cls, page:int, standalone=False): - PAGE_SIZE = 25 if relationship_cls in [SaveRelationship, Subscription]: query = relationship_cls.submission_id join = relationship_cls.post @@ -949,12 +948,18 @@ def get_saves_and_subscribes(v, template, relationship_cls, page:int, standalone ids = [x[0] for x in g.db.query(query).join(join).filter(relationship_cls.user_id == v.id).order_by(cls.created_utc.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all()] next_exists = len(ids) > PAGE_SIZE ids = ids[:PAGE_SIZE] + + extra = None + if not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: + extra = lambda q:q.filter(cls.is_banned == False, cls.deleted_utc == 0) + if cls is Submission: - listing = get_posts(ids, v=v, eager=True) + listing = get_posts(ids, v=v, eager=True, extra=extra) elif cls is Comment: - listing = get_comments(ids, v=v) + listing = get_comments(ids, v=v, extra=extra) else: raise TypeError("Only supports Submissions and Comments. This is probably the result of a bug with *this* function") + if v.client: return {"data": [x.json(g.db) for x in listing]} return render_template(template, u=v, v=v, listing=listing, page=page, next_exists=next_exists, standalone=standalone) From 7e403469cd67d0a0e7e4fe05e19cd83be5f86ee5 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 25 Nov 2022 16:12:25 -0600 Subject: [PATCH 16/16] polls: constantify max poll options --- files/helpers/const.py | 1 + files/routes/comments.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 43cc3c0a1..134f2b7ea 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -436,6 +436,7 @@ MODMAIL_ID = 2 POLL_THREAD = 0 POLL_BET_COINS = 200 +POLL_MAX_OPTIONS = 10 WELCOME_MSG = f"Welcome to {SITE_NAME}!" LOTTERY_TICKET_COST = 12 diff --git a/files/routes/comments.py b/files/routes/comments.py index 7c71fc6b6..e6766f93b 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -132,12 +132,12 @@ def comment(v): abort(403, "You can't reply to users who have blocked you or users that you have blocked.") options = [] - for i in list(poll_regex.finditer(body))[:10]: + for i in list(poll_regex.finditer(body))[:POLL_MAX_OPTIONS]: options.append(i.group(1)) body = body.replace(i.group(0), "") choices = [] - for i in list(choice_regex.finditer(body))[:10]: + for i in list(choice_regex.finditer(body))[:POLL_MAX_OPTIONS]: choices.append(i.group(1)) body = body.replace(i.group(0), "") @@ -390,7 +390,7 @@ def edit_comment(cid, v): elif v.bird and len(body) > 140: abort(403, "You have to type less than 140 characters!") - for i in list(poll_regex.finditer(body))[:10]: + for i in list(poll_regex.finditer(body))[:POLL_MAX_OPTIONS]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") @@ -401,7 +401,7 @@ def edit_comment(cid, v): ) g.db.add(option) - for i in list(choice_regex.finditer(body))[:10]: + for i in list(choice_regex.finditer(body))[:POLL_MAX_OPTIONS]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!")