From ffa83ad3e7841cb7f0f49a9f56e57dc8d77e4c98 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 26 Sep 2022 10:58:43 +0200 Subject: [PATCH 1/4] disallow permabanned hole mods from pinning or unpinning --- files/routes/subs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/routes/subs.py b/files/routes/subs.py index 33b8f5b3b..e920e89d4 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -513,7 +513,7 @@ def subs(v): return render_template('sub/subs.html', v=v, subs=subs) @app.post("/hole_pin/") -@auth_required +@is_not_permabanned def hole_pin(v, pid): p = get_post(pid) @@ -531,7 +531,7 @@ def hole_pin(v, pid): return {"message": f"Post pinned to /h/{p.sub} successfully!"} @app.post("/hole_unpin/") -@auth_required +@is_not_permabanned def hole_unpin(v, pid): p = get_post(pid) From 574040c3f5562f428980aff019c0dd294a075b00 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 26 Sep 2022 11:02:39 +0200 Subject: [PATCH 2/4] add furry and pony image hosts --- files/helpers/const.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 9f6bf912f..962e6342f 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -1013,7 +1013,13 @@ approved_embed_hosts = { 'substackcdn.com', '9gag.com', 'ifunny.co', - 'wixmp.com' + 'wixmp.com', + 'derpicdn.net', + 'twibooru.org', + 'ponybooru.org', + 'e621.net', + 'ponerpics.org', + 'furaffinity.net' } From 6b01467102e3ab023c9af16db58da9453139c702 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 27 Sep 2022 02:19:52 +0200 Subject: [PATCH 3/4] check for existing subscription --- files/routes/users.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/files/routes/users.py b/files/routes/users.py index 68bc3a9fe..2e1c34549 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -720,8 +720,10 @@ def song(song): @limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def subscribe(v, post_id): - new_sub = Subscription(user_id=v.id, submission_id=post_id) - g.db.add(new_sub) + existing = g.db.query(Subscription).filter_by(user_id=v.id, submission_id=post_id).one_or_none(): + if not existing: + new_sub = Subscription(user_id=v.id, submission_id=post_id) + g.db.add(new_sub) return {"message": "Subscribed to post successfully!"} @app.post("/unsubscribe/") @@ -729,9 +731,9 @@ def subscribe(v, post_id): @limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def unsubscribe(v, post_id): - sub=g.db.query(Subscription).filter_by(user_id=v.id, submission_id=post_id).one_or_none() - if sub: - g.db.delete(sub) + existing = g.db.query(Subscription).filter_by(user_id=v.id, submission_id=post_id).one_or_none() + if existing: + g.db.delete(existing) return {"message": "Unsubscribed from post successfully!"} @app.post("/@/message") From 9a6dda2e1cba472bc1de238a25bb13c12981ccd8 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 27 Sep 2022 02:22:06 +0200 Subject: [PATCH 4/4] fix syntax error in last commit --- files/routes/users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/routes/users.py b/files/routes/users.py index 2e1c34549..beb9c142e 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -720,7 +720,7 @@ def song(song): @limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def subscribe(v, post_id): - existing = g.db.query(Subscription).filter_by(user_id=v.id, submission_id=post_id).one_or_none(): + existing = g.db.query(Subscription).filter_by(user_id=v.id, submission_id=post_id).one_or_none() if not existing: new_sub = Subscription(user_id=v.id, submission_id=post_id) g.db.add(new_sub)