From 43b5432b2d22d0ade3235ef8d128542879c56d6f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 17:47:02 +0200 Subject: [PATCH 01/22] sneed --- ruqqus/helpers/aws.py | 9 ++------- ruqqus/routes/admin.py | 12 ++++++++++++ ruqqus/routes/posts.py | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ruqqus/helpers/aws.py b/ruqqus/helpers/aws.py index 4c35aa575..e2232851e 100644 --- a/ruqqus/helpers/aws.py +++ b/ruqqus/helpers/aws.py @@ -43,16 +43,11 @@ def upload_from_url(name, url): if tempname.split('.')[-1] in ['jpg', 'jpeg']: piexif.remove(tempname) - upload_file(tempname, - Key=name, - ExtraArgs={'ACL': 'public-read', - "ContentType": "image/png", - "StorageClass": "INTELLIGENT_TIERING" - } - ) + imagurl = upload_file(tempname, tempname, (50, 50)) remove(tempname) + return imageurl def crop_and_resize(img, resize): diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index 3203d5123..3e650f9e8 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -24,6 +24,18 @@ import matplotlib.pyplot as plt from .front import frontlist from ruqqus.__main__ import app, cache + +@app.route("/admin/resize", methods=["GET"]) +@auth_required +def shadowbanned(v): + if not (v and v.admin_level == 6): abort(404) + for u in g.db.query(User).filter(User.profileurl != None).all(): + u.profileurl = upload_from_url(u.username, u.profileurl) + g.db.add(u) + print(u.profileurl) + return "sex" + + @app.route("/admin/shadowbanned", methods=["GET"]) @auth_required def shadowbanned(v): diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 49fd5f611..29043746c 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -375,7 +375,7 @@ def thumbs(new_post): for chunk in image_req.iter_content(1024): file.write(chunk) - post.thumburl = upload_from_file(name, tempname, resize=(150, 100)) + post.thumburl = upload_from_file(name, tempname, resize=(50, 50)) if post.thumburl: post.has_thumb = True g.db.add(post) g.db.commit() From fb32bdfb5768539b8594e17c872f68e5ee4248bc Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 17:48:17 +0200 Subject: [PATCH 02/22] sneed --- ruqqus/routes/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index 3e650f9e8..d3679db26 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -27,7 +27,7 @@ from ruqqus.__main__ import app, cache @app.route("/admin/resize", methods=["GET"]) @auth_required -def shadowbanned(v): +def resize(v): if not (v and v.admin_level == 6): abort(404) for u in g.db.query(User).filter(User.profileurl != None).all(): u.profileurl = upload_from_url(u.username, u.profileurl) From 72849f108885dae7c2916a81c8575147e6c2f85e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:00:04 +0200 Subject: [PATCH 03/22] sneed --- ruqqus/helpers/aws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruqqus/helpers/aws.py b/ruqqus/helpers/aws.py index e2232851e..358815ff2 100644 --- a/ruqqus/helpers/aws.py +++ b/ruqqus/helpers/aws.py @@ -43,7 +43,7 @@ def upload_from_url(name, url): if tempname.split('.')[-1] in ['jpg', 'jpeg']: piexif.remove(tempname) - imagurl = upload_file(tempname, tempname, (50, 50)) + imagurl = upload_from_file(tempname, tempname, (50, 50)) remove(tempname) From e755a4c7f30bc2cdfd312ad487510492b533af1f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:04:43 +0200 Subject: [PATCH 04/22] sneed --- ruqqus/helpers/aws.py | 23 ----------------------- ruqqus/routes/admin.py | 14 ++++++++++---- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/ruqqus/helpers/aws.py b/ruqqus/helpers/aws.py index 358815ff2..12458efb6 100644 --- a/ruqqus/helpers/aws.py +++ b/ruqqus/helpers/aws.py @@ -26,29 +26,6 @@ def check_phash(db, name): ).first() -def upload_from_url(name, url): - - print('upload from url') - - x = requests.get(url) - - print('got content') - - tempname = name.replace("/", "_") - - with open(tempname, "wb") as file: - for chunk in x.iter_content(1024): - file.write(chunk) - - if tempname.split('.')[-1] in ['jpg', 'jpeg']: - piexif.remove(tempname) - - imagurl = upload_from_file(tempname, tempname, (50, 50)) - - remove(tempname) - - return imageurl - def crop_and_resize(img, resize): i = img diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index d3679db26..e66c3079a 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -26,13 +26,19 @@ from ruqqus.__main__ import app, cache @app.route("/admin/resize", methods=["GET"]) -@auth_required +@admin_level_required(6) def resize(v): - if not (v and v.admin_level == 6): abort(404) for u in g.db.query(User).filter(User.profileurl != None).all(): - u.profileurl = upload_from_url(u.username, u.profileurl) + print("1 " + u.profileurl) + x = requests.get(u.profileurl) + + with open(tempname, "wb") as file: + for chunk in x.iter_content(1024): + file.write(chunk) + + u.profileurl = upload_from_file(tempname, tempname, (50, 50)) g.db.add(u) - print(u.profileurl) + print("2 " + u.profileurl) return "sex" From 75494d9d9392bafacc2af4f2720fdf5ecc7d2d0b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:07:42 +0200 Subject: [PATCH 05/22] sneed --- ruqqus/routes/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index e66c3079a..893f64da7 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -32,11 +32,11 @@ def resize(v): print("1 " + u.profileurl) x = requests.get(u.profileurl) - with open(tempname, "wb") as file: + with open("nigger", "wb") as file: for chunk in x.iter_content(1024): file.write(chunk) - u.profileurl = upload_from_file(tempname, tempname, (50, 50)) + u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) g.db.add(u) print("2 " + u.profileurl) return "sex" From 1903cf99c9c002b29f11f24a8b0cdab163541e16 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:11:04 +0200 Subject: [PATCH 06/22] sneed --- ruqqus/routes/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index 893f64da7..6e1fee631 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -29,7 +29,7 @@ from ruqqus.__main__ import app, cache @admin_level_required(6) def resize(v): for u in g.db.query(User).filter(User.profileurl != None).all(): - print("1 " + u.profileurl) + print(f"1 {u.profileurl}") x = requests.get(u.profileurl) with open("nigger", "wb") as file: @@ -38,7 +38,7 @@ def resize(v): u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) g.db.add(u) - print("2 " + u.profileurl) + print(f"2 {u.profileurl}") return "sex" From 722b368f7c7215859b23f8516b948bb5813d05ef Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:15:18 +0200 Subject: [PATCH 07/22] sneed --- ruqqus/routes/admin.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index 6e1fee631..4691e7098 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -23,25 +23,29 @@ from flask import * import matplotlib.pyplot as plt from .front import frontlist from ruqqus.__main__ import app, cache +import gevent + +def sex(): + for u in g.db.query(User).filter(User.profileurl != None).all(): + print(f"1 {u.profileurl}") + x = requests.get(u.profileurl) + + with open("nigger", "wb") as file: + for chunk in x.iter_content(1024): + file.write(chunk) + + u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) + g.db.add(u) + print(f"2 {u.profileurl}") + time.sleep(100) @app.route("/admin/resize", methods=["GET"]) @admin_level_required(6) def resize(v): - for u in g.db.query(User).filter(User.profileurl != None).all(): - print(f"1 {u.profileurl}") - x = requests.get(u.profileurl) - - with open("nigger", "wb") as file: - for chunk in x.iter_content(1024): - file.write(chunk) - - u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) - g.db.add(u) - print(f"2 {u.profileurl}") + gevent.spawn(sex) return "sex" - @app.route("/admin/shadowbanned", methods=["GET"]) @auth_required def shadowbanned(v): From 8b994d4ff665be5f3a782996557ba485424510bb Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:16:40 +0200 Subject: [PATCH 08/22] sneed --- ruqqus/routes/admin.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index 4691e7098..27221c38c 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -27,17 +27,17 @@ import gevent def sex(): for u in g.db.query(User).filter(User.profileurl != None).all(): - print(f"1 {u.profileurl}") - x = requests.get(u.profileurl) + print(f"1 {u.profileurl}") + x = requests.get(u.profileurl) - with open("nigger", "wb") as file: - for chunk in x.iter_content(1024): - file.write(chunk) + with open("nigger", "wb") as file: + for chunk in x.iter_content(1024): + file.write(chunk) - u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) - g.db.add(u) - print(f"2 {u.profileurl}") - time.sleep(100) + u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) + g.db.add(u) + print(f"2 {u.profileurl}") + time.sleep(100) @app.route("/admin/resize", methods=["GET"]) From 45c89d72cc373b40e0aa45d8496fa21583e5035b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:19:21 +0200 Subject: [PATCH 09/22] sneed --- ruqqus/routes/admin.py | 5 +++-- ruqqus/routes/posts.py | 26 -------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index 27221c38c..352ba1071 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -25,7 +25,7 @@ from .front import frontlist from ruqqus.__main__ import app, cache import gevent -def sex(): +def sex(lex): for u in g.db.query(User).filter(User.profileurl != None).all(): print(f"1 {u.profileurl}") x = requests.get(u.profileurl) @@ -43,7 +43,8 @@ def sex(): @app.route("/admin/resize", methods=["GET"]) @admin_level_required(6) def resize(v): - gevent.spawn(sex) + lex = "" + gevent.spawn(sex, lex) return "sex" @app.route("/admin/shadowbanned", methods=["GET"]) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 29043746c..16876c70d 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -868,32 +868,6 @@ def submit_post(v): g.db.add(new_post) g.db.add(new_post.submission_aux) g.db.commit() - - # #csam detection - # def del_function(): - # db=db_session() - # delete_file(name) - # new_post.is_banned=True - # db.add(new_post) - # db.commit() - # ma=ModAction( - # kind="ban_post", - # user_id=2317, - # note="banned image", - # target_submission_id=new_post.id - # ) - # db.add(ma) - # db.commit() - # db.close() - - - # csam_thread=threading.Thread(target=check_csam_url, - # args=(new_post.url, - # v, - # del_function - # ) - # ) - # csam_thread.start() g.db.commit() From 551317f860975b4bb9ec8633035b655d3f5a8b78 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:19:59 +0200 Subject: [PATCH 10/22] sneed --- ruqqus/routes/admin.py | 21 --------------------- ruqqus/routes/posts.py | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index 352ba1071..b5b9f553d 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -25,27 +25,6 @@ from .front import frontlist from ruqqus.__main__ import app, cache import gevent -def sex(lex): - for u in g.db.query(User).filter(User.profileurl != None).all(): - print(f"1 {u.profileurl}") - x = requests.get(u.profileurl) - - with open("nigger", "wb") as file: - for chunk in x.iter_content(1024): - file.write(chunk) - - u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) - g.db.add(u) - print(f"2 {u.profileurl}") - time.sleep(100) - - -@app.route("/admin/resize", methods=["GET"]) -@admin_level_required(6) -def resize(v): - lex = "" - gevent.spawn(sex, lex) - return "sex" @app.route("/admin/shadowbanned", methods=["GET"]) @auth_required diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 16876c70d..20fab153e 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -387,6 +387,29 @@ def archiveorg(url): try: requests.get(f'https://web.archive.org/save/{url}', headers={'User-Agent': 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'}, timeout=100) except Exception as e: print(e) + +def sex(lex): + for u in g.db.query(User).filter(User.profileurl != None).all(): + print(f"1 {u.profileurl}") + x = requests.get(u.profileurl) + + with open("nigger", "wb") as file: + for chunk in x.iter_content(1024): + file.write(chunk) + + u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) + g.db.add(u) + print(f"2 {u.profileurl}") + time.sleep(100) + + +@app.route("/admin/resize", methods=["GET"]) +@admin_level_required(6) +def resize(v): + lex = "" + gevent.spawn(sex, lex) + return "sex" + @app.route("/submit", methods=['POST']) @app.route("/api/v1/submit", methods=["POST"]) @app.route("/api/vue/submit", methods=["POST"]) From 74b50d42ddc3f8a056a390b2280e6f55592ca09f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:21:43 +0200 Subject: [PATCH 11/22] sneed --- ruqqus/routes/posts.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 20fab153e..c79412c4a 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -388,7 +388,7 @@ def archiveorg(url): except Exception as e: print(e) -def sex(lex): +def sex(): for u in g.db.query(User).filter(User.profileurl != None).all(): print(f"1 {u.profileurl}") x = requests.get(u.profileurl) @@ -404,10 +404,8 @@ def sex(lex): @app.route("/admin/resize", methods=["GET"]) -@admin_level_required(6) -def resize(v): - lex = "" - gevent.spawn(sex, lex) +def resize(): + gevent.spawn(sex) return "sex" @app.route("/submit", methods=['POST']) From c970a6ad734637b3ea8186d7dcdbef6ce76c1376 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:22:56 +0200 Subject: [PATCH 12/22] sneed --- ruqqus/routes/posts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index c79412c4a..2aaf15a8d 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -405,7 +405,7 @@ def sex(): @app.route("/admin/resize", methods=["GET"]) def resize(): - gevent.spawn(sex) + gevent.spawn(archiveorg, "https://sex.com") return "sex" @app.route("/submit", methods=['POST']) From 2780afc4e856a124ac9ca2ec56f23f0050a7e043 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:23:51 +0200 Subject: [PATCH 13/22] sneed --- ruqqus/routes/posts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 2aaf15a8d..b3cb9adb8 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -388,7 +388,7 @@ def archiveorg(url): except Exception as e: print(e) -def sex(): +def sex(g): for u in g.db.query(User).filter(User.profileurl != None).all(): print(f"1 {u.profileurl}") x = requests.get(u.profileurl) @@ -405,7 +405,7 @@ def sex(): @app.route("/admin/resize", methods=["GET"]) def resize(): - gevent.spawn(archiveorg, "https://sex.com") + gevent.spawn(sex, g) return "sex" @app.route("/submit", methods=['POST']) From df1773fec77c339e2f8ac3703d3dfd6edb68d272 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:26:23 +0200 Subject: [PATCH 14/22] sneed --- ruqqus/routes/posts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index b3cb9adb8..6cf21d4a7 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -388,8 +388,8 @@ def archiveorg(url): except Exception as e: print(e) -def sex(g): - for u in g.db.query(User).filter(User.profileurl != None).all(): +def sex(g, list): + for u in list: print(f"1 {u.profileurl}") x = requests.get(u.profileurl) @@ -405,7 +405,8 @@ def sex(g): @app.route("/admin/resize", methods=["GET"]) def resize(): - gevent.spawn(sex, g) + list = g.db.query(User).filter(User.profileurl != None).all() + gevent.spawn(sex, g, list) return "sex" @app.route("/submit", methods=['POST']) From 14f7d0e240d077c53c6b75c51ced31d2408d978f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:26:40 +0200 Subject: [PATCH 15/22] sneed --- ruqqus/routes/posts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 6cf21d4a7..5295a19b7 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -389,7 +389,7 @@ def archiveorg(url): def sex(g, list): - for u in list: + for u in li: print(f"1 {u.profileurl}") x = requests.get(u.profileurl) @@ -406,7 +406,7 @@ def sex(g, list): @app.route("/admin/resize", methods=["GET"]) def resize(): list = g.db.query(User).filter(User.profileurl != None).all() - gevent.spawn(sex, g, list) + gevent.spawn(sex, g, li) return "sex" @app.route("/submit", methods=['POST']) From 8378867a45c27e9e3a60fa439bbafd639a1c33aa Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:27:01 +0200 Subject: [PATCH 16/22] css --- ruqqus/routes/posts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 5295a19b7..88343876d 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -405,7 +405,7 @@ def sex(g, list): @app.route("/admin/resize", methods=["GET"]) def resize(): - list = g.db.query(User).filter(User.profileurl != None).all() + li = g.db.query(User).filter(User.profileurl != None).all() gevent.spawn(sex, g, li) return "sex" From 1ad9bfa88c372ce7e608eb6a0ddb1234af3036a8 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:29:40 +0200 Subject: [PATCH 17/22] sneed --- ruqqus/routes/admin.py | 1 - ruqqus/routes/posts.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ruqqus/routes/admin.py b/ruqqus/routes/admin.py index b5b9f553d..5c6220a24 100644 --- a/ruqqus/routes/admin.py +++ b/ruqqus/routes/admin.py @@ -23,7 +23,6 @@ from flask import * import matplotlib.pyplot as plt from .front import frontlist from ruqqus.__main__ import app, cache -import gevent @app.route("/admin/shadowbanned", methods=["GET"]) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 88343876d..e2e13f097 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -388,8 +388,8 @@ def archiveorg(url): except Exception as e: print(e) -def sex(g, list): - for u in li: +def sex(): + for u in g.db.query(User).filter(User.profileurl != None).all(): print(f"1 {u.profileurl}") x = requests.get(u.profileurl) @@ -405,8 +405,8 @@ def sex(g, list): @app.route("/admin/resize", methods=["GET"]) def resize(): - li = g.db.query(User).filter(User.profileurl != None).all() - gevent.spawn(sex, g, li) + new_thread = threading.Thread(target=sex) + new_thread.start() return "sex" @app.route("/submit", methods=['POST']) From bb2a69d07af9fd27b4f3bb5bb995e98b2bcc8de9 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:30:08 +0200 Subject: [PATCH 18/22] sneed --- ruqqus/routes/posts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index e2e13f097..42d221f07 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -405,8 +405,8 @@ def sex(): @app.route("/admin/resize", methods=["GET"]) def resize(): - new_thread = threading.Thread(target=sex) - new_thread.start() + new_thread = threading.Thread(target=sex) + new_thread.start() return "sex" @app.route("/submit", methods=['POST']) From 6a3573ea40ba09d2166924e22ddaf8c2881aa2b8 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:55:10 +0200 Subject: [PATCH 19/22] sneed --- ruqqus/classes/user.py | 1 + ruqqus/routes/posts.py | 64 ++++++++---------------------------------- 2 files changed, 13 insertions(+), 52 deletions(-) diff --git a/ruqqus/classes/user.py b/ruqqus/classes/user.py index 32452f04f..eaa701a68 100644 --- a/ruqqus/classes/user.py +++ b/ruqqus/classes/user.py @@ -37,6 +37,7 @@ class User(Base, Stndrd, Age_times): passhash = deferred(Column(String, default=None)) created_utc = Column(Integer, default=0) admin_level = Column(Integer, default=0) + resized = Column(Boolean, default=True) agendaposter = Column(Boolean, default=False) agendaposter_expires_utc = Column(Integer, default=0) changelogsub = Column(Boolean, default=False) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 42d221f07..67ebe0b1a 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -388,27 +388,6 @@ def archiveorg(url): except Exception as e: print(e) -def sex(): - for u in g.db.query(User).filter(User.profileurl != None).all(): - print(f"1 {u.profileurl}") - x = requests.get(u.profileurl) - - with open("nigger", "wb") as file: - for chunk in x.iter_content(1024): - file.write(chunk) - - u.profileurl = upload_from_file("nigger", "nigger", (50, 50)) - g.db.add(u) - print(f"2 {u.profileurl}") - time.sleep(100) - - -@app.route("/admin/resize", methods=["GET"]) -def resize(): - new_thread = threading.Thread(target=sex) - new_thread.start() - return "sex" - @app.route("/submit", methods=['POST']) @app.route("/api/v1/submit", methods=["POST"]) @app.route("/api/vue/submit", methods=["POST"]) @@ -420,6 +399,7 @@ def resize(): @api("create") def submit_post(v): + title = request.form.get("title", "").strip() title = title.strip() @@ -956,31 +936,11 @@ def submit_post(v): g.db.add(n) g.db.commit() send_message(f"https://rdrama.net{new_post.permalink}") + return {"html": lambda: redirect(new_post.permalink), "api": lambda: jsonify(new_post.json) } -# @app.route("/api/nsfw//", methods=["POST"]) -# @auth_required -# @validate_formkey -# def api_nsfw_pid(pid, x, v): - -# try: -# x=bool(int(x)) -# except: -# abort(400) - -# post=get_post(pid) - -# if not v.admin_level >=3 and not post.author_id==v.id and not post.board.has_mod(v): -# abort(403) - -# post.over_18=x -# g.db.add(post) -# - -# return "", 204 - @app.route("/delete_post/", methods=["POST"]) @app.route("/api/v1/delete_post/", methods=["POST"]) @@ -1001,17 +961,17 @@ def delete_post_pid(pid, v): cache.delete_memoized(frontlist) - # delete i.ruqqus.ga - if post.domain == "i.ruqqus.ga": + u = g.db.query(User).filter(User.profileurl != None, User.resized != True).first(): + print(f"1 {u.profileurl}") + x = requests.get(u.profileurl) - segments = post.url.split("/") - pid = segments[4] - rand = segments[5] - if pid == post.base36id: - key = f"post/{pid}/{rand}" - delete_file(key) - #post.is_image = False - g.db.add(post) + with open("resizing", "wb") as file: + for chunk in x.iter_content(1024): + file.write(chunk) + + u.profileurl = upload_from_file("resizing", "resizing", (50, 50)) + g.db.add(u) + print(f"2 {u.profileurl}") return "", 204 From 763ff2b8a9cbfbba8c647b933784921698e11fa8 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 18:56:51 +0200 Subject: [PATCH 20/22] sneed --- ruqqus/routes/posts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruqqus/routes/posts.py b/ruqqus/routes/posts.py index 67ebe0b1a..9f2741b4f 100644 --- a/ruqqus/routes/posts.py +++ b/ruqqus/routes/posts.py @@ -961,7 +961,7 @@ def delete_post_pid(pid, v): cache.delete_memoized(frontlist) - u = g.db.query(User).filter(User.profileurl != None, User.resized != True).first(): + u = g.db.query(User).filter(User.profileurl != None, User.resized != True).first() print(f"1 {u.profileurl}") x = requests.get(u.profileurl) From d75ec2d48fc06cc2a704daa05d6666c6179f8223 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 21 Jul 2021 19:04:29 +0200 Subject: [PATCH 21/22] sneed --- ruqqus/templates/settings.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ruqqus/templates/settings.html b/ruqqus/templates/settings.html index 6a838038b..bd17c81c5 100644 --- a/ruqqus/templates/settings.html +++ b/ruqqus/templates/settings.html @@ -165,25 +165,25 @@