From 2d21863e1994e5b345281d5e61b94365387f2918 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 13 Jul 2022 20:14:37 +0200 Subject: [PATCH] replace "request.host" with "SITE" --- files/__main__.py | 2 +- files/mail/__init__.py | 2 +- files/routes/awards.py | 6 ++-- files/routes/chat.py | 2 +- files/routes/comments.py | 26 +++++++------- files/routes/front.py | 2 +- files/routes/login.py | 2 +- files/routes/oauth.py | 10 +++--- files/routes/posts.py | 18 +++++----- files/routes/reporting.py | 4 +-- files/routes/settings.py | 44 ++++++++++++------------ files/routes/static.py | 2 +- files/routes/subs.py | 10 +++--- files/routes/users.py | 26 +++++++------- files/routes/votes.py | 4 +-- files/templates/comments.html | 4 +-- files/templates/default.html | 4 +-- files/templates/home.html | 4 +-- files/templates/post_actions.html | 2 +- files/templates/post_actions_mobile.html | 2 +- files/templates/settings.html | 8 ++--- files/templates/settings2.html | 4 +-- files/templates/sign_up.html | 8 ++--- files/templates/sign_up_failed_ref.html | 8 ++--- files/templates/submission.html | 6 ++-- files/templates/submission_listing.html | 2 +- files/templates/submit.html | 2 +- files/templates/userpage.html | 2 +- 28 files changed, 108 insertions(+), 108 deletions(-) diff --git a/files/__main__.py b/files/__main__.py index 298625f50..1a0f9860f 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -83,7 +83,7 @@ def before_request(): with open('site_settings.json', 'r', encoding='utf_8') as f: app.config['SETTINGS'] = json.load(f) - if request.host != app.config["SERVER_NAME"]: return {"error":"Unauthorized host provided."}, 401 + if SITE != app.config["SERVER_NAME"]: return {"error":"Unauthorized host provided."}, 401 if request.headers.get("CF-Worker"): return {"error":"Cloudflare workers are not allowed to access this website."}, 401 if not app.config['SETTINGS']['Bots'] and request.headers.get("Authorization"): abort(503) diff --git a/files/mail/__init__.py b/files/mail/__init__.py index 4152b0d91..5392e61a3 100644 --- a/files/mail/__init__.py +++ b/files/mail/__init__.py @@ -41,7 +41,7 @@ def send_verification_email(user, email=None): @app.post("/verify_email") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def api_verify_email(v): diff --git a/files/routes/awards.py b/files/routes/awards.py index d3b4413e8..417eb03e1 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -103,7 +103,7 @@ def buy(v, award): @app.post("/award//") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def award_thing(v, thing_type, id): @@ -315,7 +315,7 @@ def award_thing(v, thing_type, id): @app.get("/admin/awards") @admin_level_required(2) def admin_userawards_get(v): - if request.host == 'pcmemes.net' and v.admin_level < 3: abort(403) + if SITE == 'pcmemes.net' and v.admin_level < 3: abort(403) if v.admin_level != 3: return render_template("admin/awards.html", awards=list(AWARDS3.values()), v=v) @@ -326,7 +326,7 @@ def admin_userawards_get(v): @limiter.limit("1/second;30/minute;200/hour;1000/day") @admin_level_required(2) def admin_userawards_post(v): - if request.host == 'pcmemes.net' and v.admin_level < 3: abort(403) + if SITE == 'pcmemes.net' and v.admin_level < 3: abort(403) try: u = request.values.get("username").strip() except: abort(404) diff --git a/files/routes/chat.py b/files/routes/chat.py index 5a623034b..cc2e98c35 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -36,7 +36,7 @@ def chatjs(): @socketio.on('speak') @limiter.limit("3/second;10/minute") -@limiter.limit("3/second;10/minute", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("3/second;10/minute", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def speak(data, v): if v.is_banned: return '', 403 diff --git a/files/routes/comments.py b/files/routes/comments.py index 91207a22a..e740b0c2d 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -61,7 +61,7 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): if not pid: if comment.parent_submission: pid = comment.parent_submission elif SITE_NAME == 'rDrama': pid = 6489 - elif request.host == 'pcmemes.net': pid = 2487 + elif SITE == 'pcmemes.net': pid = 2487 else: pid = 1 try: pid = int(pid) @@ -137,7 +137,7 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): @app.post("/comment") @limiter.limit("1/second;20/minute;200/hour;1000/day") -@limiter.limit("1/second;20/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;20/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def api_comment(v): if v.is_suspended: return {"error": "You can't perform this action while banned."}, 403 @@ -225,7 +225,7 @@ def api_comment(v): copyfile(oldname, filename) process_image(filename, 200) requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, - data=f'{{"files": ["https://{request.host}/assets/images/badges/{badge.id}.webp"]}}', timeout=5) + data=f'{{"files": ["https://{SITE}/assets/images/badges/{badge.id}.webp"]}}', timeout=5) except Exception as e: return {"error": str(e)}, 400 elif v.admin_level > 2 and parent_post.id == MARSEY_THREAD: @@ -262,7 +262,7 @@ def api_comment(v): badge_grant(badge_id=17, user=user) requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, - data=f'{{"files": ["https://{request.host}/e/{name}.webp"]}}', timeout=5) + data=f'{{"files": ["https://{SITE}/e/{name}.webp"]}}', timeout=5) cache.delete_memoized(marsey_list) except Exception as e: @@ -384,7 +384,7 @@ def api_comment(v): ) g.db.add(choice) - if request.host == 'pcmemes.net' and c.body.lower().startswith("based"): + if SITE == 'pcmemes.net' and c.body.lower().startswith("based"): pill = based_regex.match(body) if level == 1: basedguy = get_account(parent_post.author_id) @@ -564,7 +564,7 @@ def api_comment(v): g.db.add(n) if parent.author.id != v.id and PUSHER_ID != 'blahblahblah' and not v.shadowbanned: - interests = f'{request.host}{parent.author.id}' + interests = f'{SITE}{parent.author.id}' title = f'New reply by @{c.author_name}' @@ -633,7 +633,7 @@ def api_comment(v): @app.post("/edit_comment/") @limiter.limit("1/second;10/minute;100/hour;200/day") -@limiter.limit("1/second;10/minute;100/hour;200/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;10/minute;100/hour;200/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def edit_comment(cid, v): @@ -791,7 +791,7 @@ def edit_comment(cid, v): @app.post("/delete/comment/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def delete_comment(cid, v): @@ -819,7 +819,7 @@ def delete_comment(cid, v): @app.post("/undelete/comment/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def undelete_comment(cid, v): @@ -930,7 +930,7 @@ def mod_unpin(cid, v): @app.post("/save_comment/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def save_comment(cid, v): @@ -947,7 +947,7 @@ def save_comment(cid, v): @app.post("/unsave_comment/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def unsave_comment(cid, v): @@ -962,7 +962,7 @@ def unsave_comment(cid, v): @app.post("/blackjack/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def handle_blackjack_action(cid, v): comment = get_comment(cid) @@ -1002,7 +1002,7 @@ def diff_words(answer, guess): @app.post("/wordle/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def handle_wordle_action(cid, v): diff --git a/files/routes/front.py b/files/routes/front.py index 134bad628..e82d8d2b8 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -117,7 +117,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if not (v and v.shadowbanned): posts = posts.join(Submission.author).filter(User.shadowbanned == None) - if request.host == 'rdrama.net': num = 5 + if SITE == 'rdrama.net': num = 5 else: num = 0.5 if sort == 'hot': diff --git a/files/routes/login.py b/files/routes/login.py index 10b3bc96a..9e5fe498c 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -162,7 +162,7 @@ def me(v): @app.post("/logout") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def logout(v): diff --git a/files/routes/oauth.py b/files/routes/oauth.py index 14b00b3b5..522856034 100644 --- a/files/routes/oauth.py +++ b/files/routes/oauth.py @@ -18,7 +18,7 @@ def authorize_prompt(v): @app.post("/authorize") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def authorize(v): @@ -40,7 +40,7 @@ def authorize(v): @app.post("/api_keys") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def request_api_keys(v): @@ -82,7 +82,7 @@ def request_api_keys(v): @app.post("/delete_app/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def delete_oauth_app(v, aid): @@ -102,7 +102,7 @@ def delete_oauth_app(v, aid): @app.post("/edit_app/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def edit_oauth_app(v, aid): @@ -262,7 +262,7 @@ def admin_apps_list(v): @app.post("/oauth/reroll/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def reroll_oauth_tokens(aid, v): diff --git a/files/routes/posts.py b/files/routes/posts.py index 1226a5957..1d465a8cb 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -45,7 +45,7 @@ def toggle_club(pid, v): @app.post("/publish/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def publish(pid, v): post = get_post(pid) @@ -377,7 +377,7 @@ def morecomments(v, cid): @app.post("/edit_post/") @limiter.limit("1/second;10/minute;100/hour;200/day") -@limiter.limit("1/second;10/minute;100/hour;200/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;10/minute;100/hour;200/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def edit_post(pid, v): p = get_post(pid) @@ -684,7 +684,7 @@ def api_is_repost(): @app.post("/submit") @app.post("/h//submit") @limiter.limit(POST_RATE_LIMIT) -@limiter.limit(POST_RATE_LIMIT, key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit(POST_RATE_LIMIT, key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def submit_post(v, sub=None): @@ -1062,7 +1062,7 @@ def submit_post(v, sub=None): post.upvotes += 3 g.db.add(post) - if request.host == 'rdrama.net' and post.sub and post.sub not in ('dankchristianmemes','fatpeoplehate','braincels','truth') and v.id != AEVANN_ID: + if SITE == 'rdrama.net' and post.sub and post.sub not in ('dankchristianmemes','fatpeoplehate','braincels','truth') and v.id != AEVANN_ID: g.db.flush() autovote = Vote( user_id=AEVANN_ID, @@ -1097,7 +1097,7 @@ def submit_post(v, sub=None): @app.post("/delete_post/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def delete_post_pid(pid, v): post = get_post(pid) @@ -1121,7 +1121,7 @@ def delete_post_pid(pid, v): @app.post("/undelete_post/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def undelete_post_pid(pid, v): post = get_post(pid) @@ -1187,7 +1187,7 @@ def toggle_post_nsfw(pid, v): @app.post("/save_post/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def save_post(pid, v): @@ -1203,7 +1203,7 @@ def save_post(pid, v): @app.post("/unsave_post/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def unsave_post(pid, v): @@ -1235,7 +1235,7 @@ def api_pin_post(post_id, v): @app.get("/submit/title") @limiter.limit("6/minute") -@limiter.limit("6/minute", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("6/minute", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def get_post_title(v): diff --git a/files/routes/reporting.py b/files/routes/reporting.py index 53fcf3e0e..a3b83c67e 100644 --- a/files/routes/reporting.py +++ b/files/routes/reporting.py @@ -8,7 +8,7 @@ from files.helpers.sanitize import filter_emojis_only @app.post("/report/post/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def api_flag_post(pid, v): @@ -76,7 +76,7 @@ def api_flag_post(pid, v): @app.post("/report/comment/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def api_flag_comment(cid, v): diff --git a/files/routes/settings.py b/files/routes/settings.py index 2be1dc363..a16704d9f 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -19,7 +19,7 @@ import tldextract @app.post("/settings/removebackground") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def removebackground(v): v.background = None @@ -28,7 +28,7 @@ def removebackground(v): @app.post("/settings/profile") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_profile_post(v): updated = False @@ -310,7 +310,7 @@ def changelogsub(v): @app.post("/settings/namecolor") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def namecolor(v): @@ -326,7 +326,7 @@ def namecolor(v): @app.post("/settings/themecolor") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def themecolor(v): @@ -342,7 +342,7 @@ def themecolor(v): @app.post("/settings/gumroad") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def gumroad(v): if not (v.email and v.is_activated): @@ -379,7 +379,7 @@ def gumroad(v): @app.post("/settings/titlecolor") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def titlecolor(v): @@ -394,7 +394,7 @@ def titlecolor(v): @app.post("/settings/verifiedcolor") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def verifiedcolor(v): verifiedcolor = str(request.values.get("verifiedcolor", "")).strip() @@ -406,7 +406,7 @@ def verifiedcolor(v): @app.post("/settings/security") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_security_post(v): if request.values.get("new_password"): @@ -487,7 +487,7 @@ def settings_security_post(v): @app.post("/settings/log_out_all_others") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_log_out_others(v): @@ -508,7 +508,7 @@ def settings_log_out_others(v): @app.post("/settings/images/profile") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_images_profile(v): if request.headers.get("cf-ipcountry") == "T1": return {"error":"Image uploads are not allowed through TOR."}, 403 @@ -543,7 +543,7 @@ def settings_images_profile(v): @app.post("/settings/images/banner") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_images_banner(v): if request.headers.get("cf-ipcountry") == "T1": return {"error":"Image uploads are not allowed through TOR."}, 403 @@ -578,7 +578,7 @@ def settings_css_get(v): @app.post("/settings/css") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_css(v): if v.agendaposter: return {"error": "Agendapostered users can't edit css!"} @@ -600,7 +600,7 @@ def settings_profilecss_get(v): @app.post("/settings/profilecss") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_profilecss(v): profilecss = request.values.get("profilecss").strip().replace('\\', '').strip()[:4000] @@ -620,7 +620,7 @@ def settings_profilecss(v): @app.post("/settings/block") @limiter.limit("1/second;10/day") -@limiter.limit("1/second;10/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;10/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_block_user(v): @@ -657,7 +657,7 @@ def settings_block_user(v): @app.post("/settings/unblock") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_unblock_user(v): @@ -687,7 +687,7 @@ def settings_apps(v): @app.post("/settings/remove_discord") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_remove_discord(v): @@ -707,7 +707,7 @@ def settings_content_get(v): @app.post("/settings/name_change") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def settings_name_change(v): @@ -753,7 +753,7 @@ def settings_name_change(v): @app.post("/settings/song_change_mp3") @limiter.limit("3/second;10/day") -@limiter.limit("3/second;10/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("3/second;10/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_song_change_mp3(v): @@ -783,7 +783,7 @@ def settings_song_change_mp3(v): @app.post("/settings/song_change") @limiter.limit("3/second;10/day") -@limiter.limit("3/second;10/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("3/second;10/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_song_change(v): song=request.values.get("song").strip() @@ -860,7 +860,7 @@ def settings_song_change(v): @app.post("/settings/title_change") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_title_change(v): @@ -884,7 +884,7 @@ def settings_title_change(v): @app.post("/settings/pronouns_change") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_pronouns_change(v): @@ -904,7 +904,7 @@ def settings_pronouns_change(v): @app.post("/settings/checkmark_text") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def settings_checkmark_text(v): diff --git a/files/routes/static.py b/files/routes/static.py index 2a7c5bf8b..5fad9059c 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -188,7 +188,7 @@ def contact(v): @app.post("/send_admin") @limiter.limit("1/second;2/minute;6/hour;10/day") -@limiter.limit("1/second;2/minute;6/hour;10/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;2/minute;6/hour;10/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def submit_contact(v): body = request.values.get("message") diff --git a/files/routes/subs.py b/files/routes/subs.py index d43289129..3b15cf527 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -198,7 +198,7 @@ def sub_followers(v, sub): @app.post("/h//add_mod") @limiter.limit("1/second;5/day") -@limiter.limit("1/second;5/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;5/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def add_mod(v, sub): sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none() @@ -328,7 +328,7 @@ def sub_settings(v, sub): @app.post('/h//sidebar') @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def post_sub_sidebar(v, sub): sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none() @@ -348,7 +348,7 @@ def post_sub_sidebar(v, sub): @app.post('/h//css') @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def post_sub_css(v, sub): sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none() @@ -385,7 +385,7 @@ def get_sub_css(sub): @app.post("/h//banner") @limiter.limit("1/second;10/day") -@limiter.limit("1/second;10/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;10/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def sub_banner(v, sub): if request.headers.get("cf-ipcountry") == "T1": return {"error":"Image uploads are not allowed through TOR."}, 403 @@ -412,7 +412,7 @@ def sub_banner(v, sub): @app.post("/h//sidebar_image") @limiter.limit("1/second;10/day") -@limiter.limit("1/second;10/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;10/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def sub_sidebar(v, sub): if request.headers.get("cf-ipcountry") == "T1": return {"error":"Image uploads are not allowed through TOR."}, 403 diff --git a/files/routes/users.py b/files/routes/users.py index 5d0d9ce49..21394090b 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -373,7 +373,7 @@ def downvoting(v, username): @app.post("/@/suicide") @limiter.limit("1/second;5/day") -@limiter.limit("1/second;5/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;5/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def suicide(v, username): user = get_user(username) @@ -392,7 +392,7 @@ def get_coins(v, username): @app.post("/@/transfer_coins") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def transfer_coins(v, username): receiver = get_user(username) @@ -437,7 +437,7 @@ def transfer_coins(v, username): @app.post("/@/transfer_bux") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def transfer_bux(v, username): receiver = get_user(username) @@ -499,7 +499,7 @@ def leaderboard(v): sq = g.db.query(User.id, func.rank().over(order_by=User.received_award_count.desc()).label("rank")).subquery() pos5 = g.db.query(sq.c.id, sq.c.rank).filter(sq.c.id == v.id).limit(1).one()[1] - if request.host == 'pcmemes.net': + if SITE == 'pcmemes.net': users6 = users.order_by(User.basedcount.desc()).limit(25).all() sq = g.db.query(User.id, func.rank().over(order_by=User.basedcount.desc()).label("rank")).subquery() pos6 = g.db.query(sq.c.id, sq.c.rank).filter(sq.c.id == v.id).limit(1).one()[1] @@ -603,7 +603,7 @@ def song(song): @app.post("/subscribe/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@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) @@ -612,7 +612,7 @@ def subscribe(v, post_id): @app.post("/unsubscribe/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@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() @@ -627,7 +627,7 @@ def reportbugs(v): @app.post("/@/message") @limiter.limit("1/second;10/minute;20/hour;50/day") -@limiter.limit("1/second;10/minute;20/hour;50/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;10/minute;20/hour;50/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def message2(v, username): user = get_user(username, v=v) @@ -687,7 +687,7 @@ def message2(v, username): if PUSHER_ID != 'blahblahblah' and not v.shadowbanned: - interests = f'{request.host}{user.id}' + interests = f'{SITE}{user.id}' title = f'New message from @{username}' @@ -703,7 +703,7 @@ def message2(v, username): @app.post("/reply") @limiter.limit("1/second;6/minute;50/hour;200/day") -@limiter.limit("1/second;6/minute;50/hour;200/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;6/minute;50/hour;200/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def messagereply(v): @@ -765,7 +765,7 @@ def messagereply(v): g.db.delete(n) if PUSHER_ID != 'blahblahblah' and not v.shadowbanned: - interests = f'{request.host}{user_id}' + interests = f'{SITE}{user_id}' title = f'New message from @{v.username}' @@ -1070,7 +1070,7 @@ def u_user_id_info(id, v=None): @app.post("/follow/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def follow_user(username, v): @@ -1095,7 +1095,7 @@ def follow_user(username, v): @app.post("/unfollow/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def unfollow_user(username, v): @@ -1123,7 +1123,7 @@ def unfollow_user(username, v): @app.post("/remove_follow/") @limiter.limit("1/second;30/minute;200/hour;1000/day") -@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required def remove_follow(username, v): target = get_user(username) diff --git a/files/routes/votes.py b/files/routes/votes.py index 18de8a27a..efb15f62c 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -59,7 +59,7 @@ def vote_info_get(v, link): @app.post("/vote/post//") @limiter.limit("5/second;60/minute;1000/hour;2000/day") -@limiter.limit("5/second;60/minute;1000/hour;2000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("5/second;60/minute;1000/hour;2000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def api_vote_post(post_id, new, v): @@ -129,7 +129,7 @@ def api_vote_post(post_id, new, v): @app.post("/vote/comment//") @limiter.limit("5/second;60/minute;1000/hour;2000/day") -@limiter.limit("5/second;60/minute;1000/hour;2000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@limiter.limit("5/second;60/minute;1000/hour;2000/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @is_not_permabanned def api_vote_comment(comment_id, new, v): diff --git a/files/templates/comments.html b/files/templates/comments.html index fedc17d0f..beeceeda9 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -441,7 +441,7 @@ Context - + {% if v %} @@ -648,7 +648,7 @@ Context - Copy link + Copy link {% if v %} Report diff --git a/files/templates/default.html b/files/templates/default.html index 55039a945..b35609c19 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -93,12 +93,12 @@ - + - + diff --git a/files/templates/home.html b/files/templates/home.html index a83d19cd4..7c0d1145e 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -179,12 +179,12 @@ {% endif %} {% if PUSHER_ID != 'blahblahblah' and v %} -
{{request.host}}{{v.id}}
+
{{SITE}}{{v.id}}
{{PUSHER_ID}}
{% endif %} diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html index fc6da1202..058343c70 100644 --- a/files/templates/post_actions.html +++ b/files/templates/post_actions.html @@ -12,7 +12,7 @@ Give Award {% endif %} -Copy link +Copy link {% if v %} Subscribe diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html index caeb29b25..8b7d47e10 100644 --- a/files/templates/post_actions_mobile.html +++ b/files/templates/post_actions_mobile.html @@ -8,7 +8,7 @@ {% if not p.ghost or v.id == AEVANN_ID %}{% endif %} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 9599fb1be..eeebfcb68 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -18,12 +18,12 @@ {% block pagetitle %}Settings - {{SITE_NAME}}{% endblock %} - + - + - + @@ -31,7 +31,7 @@ - + diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 845db65d4..5acd774eb 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -16,12 +16,12 @@ - + - + diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index ca2ae76a1..8c9bdb5a7 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -14,12 +14,12 @@ - + - + - + @@ -27,7 +27,7 @@ - + {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index c10c80e83..f911dbfae 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -15,12 +15,12 @@ - + - + - + @@ -28,7 +28,7 @@ - + {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} diff --git a/files/templates/submission.html b/files/templates/submission.html index 64b41114a..62fe6db0a 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -524,7 +524,7 @@ {% endif %} - + @@ -548,7 +548,7 @@ {%- endif %} - + @@ -601,7 +601,7 @@ {% block content %} -{% if request.host == 'pcmemes.net' %} +{% if SITE == 'pcmemes.net' %} {% set cc='SPLASH MOUNTAIN' %} {% else %} {% set cc='COUNTRY CLUB' %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 35591eab1..076701b12 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -5,7 +5,7 @@ {% include "award_modal.html" %} {% endif %} -{% if request.host == 'pcmemes.net' %} +{% if SITE == 'pcmemes.net' %} {% set cc='SPLASH MOUNTAIN' %} {% else %} {% set cc='COUNTRY CLUB' %} diff --git a/files/templates/submit.html b/files/templates/submit.html index 0746020ca..c4ee47dbf 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -12,7 +12,7 @@ - {% if request.host == 'pcmemes.net' %} + {% if SITE == 'pcmemes.net' %} {% set cc='Splash Mountain' %} {% else %} {% set cc='Country Club' %} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 6af83a35e..d61b99cf1 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -18,7 +18,7 @@ - +