From 116653176009062bd2f21c056497e7f658f594d2 Mon Sep 17 00:00:00 2001 From: Aevann Date: Wed, 21 Feb 2024 23:14:35 +0200 Subject: [PATCH] remove now unnecessary function --- files/routes/comments.py | 1 - files/routes/static.py | 19 +++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/files/routes/comments.py b/files/routes/comments.py index 8bf11ffa5..8330c2cbd 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -19,7 +19,6 @@ from files.helpers.can_see import * from files.routes.front import comment_idlist from files.routes.routehelpers import execute_shadowban_viewers_and_voters from files.routes.wrappers import * -from files.routes.static import badge_list from files.__main__ import app, cache, limiter def _mark_comment_as_read(cid, vid): diff --git a/files/routes/static.py b/files/routes/static.py index f9869693f..862d879fe 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -313,11 +313,15 @@ def submit_contact(v): return {"message": "Your message has been sent to the admins!"} -def badge_list(site, can_view_patron_badges): - +@app.get("/badges") +@feature_required('BADGES') +@limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400) +@limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) +@auth_required +def badges(v): badges = g.db.query(BadgeDef) - if not can_view_patron_badges: + if v.admin_level < PERMS['VIEW_PATRONS']: badges = badges.filter(BadgeDef.id.notin_(PATRON_BADGES)) badges = badges.order_by(BadgeDef.id).all() @@ -329,15 +333,6 @@ def badge_list(site, can_view_patron_badges): for c in counts_raw: counts[c[0]] = (c[1], float(c[1]) * 100 / max(users, 1)) - return badges, counts - -@app.get("/badges") -@feature_required('BADGES') -@limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400) -@limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) -@auth_required -def badges(v): - badges, counts = badge_list(SITE, v.admin_level >= PERMS['VIEW_PATRONS']) return render_template("badges.html", v=v, badges=badges, counts=counts) @app.get("/blocks")