From 022a81a4b9cdf05deb5be4e9f0a630a3d87d4c54 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Tue, 15 Nov 2022 05:37:42 -0600 Subject: [PATCH] remove unnecessary feature_required flags, moving them to the routes import --- files/routes/__init__.py | 8 +++++--- files/routes/awards.py | 3 --- files/routes/casino.py | 12 ------------ files/routes/lottery.py | 5 ----- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/files/routes/__init__.py b/files/routes/__init__.py index 98a6ee76d..ebcd9282b 100644 --- a/files/routes/__init__.py +++ b/files/routes/__init__.py @@ -32,11 +32,13 @@ from .static import * from .users import * from .votes import * from .feeds import * -from .awards import * +if FEATURES['AWARDS']: + from .awards import * from .giphy import * from .subs import * -from .lottery import * -from .casino import * +if FEATURES['GAMBLING']: + from .lottery import * + from .casino import * from .polls import * from .notifications import * from .hats import * diff --git a/files/routes/awards.py b/files/routes/awards.py index 70c1c9535..27b2be15f 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -21,7 +21,6 @@ from .front import frontlist @app.get("/shop") @app.get("/settings/shop") -@feature_required('AWARDS') @auth_required def shop(v): AWARDS = deepcopy(AWARDS2) @@ -45,7 +44,6 @@ def shop(v): @app.post("/buy/") -@feature_required('AWARDS') @limiter.limit("100/minute;200/hour;1000/day") @auth_required def buy(v, award): @@ -125,7 +123,6 @@ def buy(v, award): return {"message": f"{award_title} award bought!"} @app.post("/award//") -@feature_required('AWARDS') @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @is_not_permabanned @ratelimit_user() diff --git a/files/routes/casino.py b/files/routes/casino.py index fedf308a5..c74b91860 100644 --- a/files/routes/casino.py +++ b/files/routes/casino.py @@ -12,7 +12,6 @@ from files.routes.wrappers import * from files.__main__ import app, limiter @app.get("/casino") -@feature_required('GAMBLING') @limiter.limit("100/minute;2000/hour;12000/day") @auth_required def casino(v): @@ -23,7 +22,6 @@ def casino(v): @app.get("/casino/") -@feature_required('GAMBLING') @limiter.limit("100/minute;2000/hour;12000/day") @auth_required def casino_game_page(v, game): @@ -51,7 +49,6 @@ def casino_game_page(v, game): @app.get("/casino//feed") -@feature_required('GAMBLING') @limiter.limit("100/minute;2000/hour;12000/day") @auth_required def casino_game_feed(v, game): @@ -66,7 +63,6 @@ def casino_game_feed(v, game): # Lottershe @app.get("/lottershe") -@feature_required('GAMBLING') @limiter.limit("100/minute;2000/hour;12000/day") @auth_required def lottershe(v): @@ -78,7 +74,6 @@ def lottershe(v): # Slots @app.post("/casino/slots") -@feature_required('GAMBLING') @limiter.limit("100/minute;2000/hour;12000/day") @auth_required def pull_slots(v): @@ -109,7 +104,6 @@ def pull_slots(v): # 21 @app.post("/casino/twentyone/deal") -@feature_required('GAMBLING') @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required def blackjack_deal_to_player(v): @@ -129,7 +123,6 @@ def blackjack_deal_to_player(v): @app.post("/casino/twentyone/hit") -@feature_required('GAMBLING') @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required def blackjack_player_hit(v): @@ -145,7 +138,6 @@ def blackjack_player_hit(v): @app.post("/casino/twentyone/stay") -@feature_required('GAMBLING') @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required def blackjack_player_stay(v): @@ -161,7 +153,6 @@ def blackjack_player_stay(v): @app.post("/casino/twentyone/double-down") -@feature_required('GAMBLING') @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required def blackjack_player_doubled_down(v): @@ -177,7 +168,6 @@ def blackjack_player_doubled_down(v): @app.post("/casino/twentyone/buy-insurance") -@feature_required('GAMBLING') @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required def blackjack_player_bought_insurance(v): @@ -193,7 +183,6 @@ def blackjack_player_bought_insurance(v): # Roulette @app.get("/casino/roulette/bets") -@feature_required('GAMBLING') @limiter.limit("100/minute;2000/hour;12000/day") @auth_required def roulette_get_bets(v): @@ -206,7 +195,6 @@ def roulette_get_bets(v): @app.post("/casino/roulette/place-bet") -@feature_required('GAMBLING') @limiter.limit("100/minute;2000/hour;12000/day") @auth_required def roulette_player_placed_bet(v): diff --git a/files/routes/lottery.py b/files/routes/lottery.py index 920754909..bc7f37d5e 100644 --- a/files/routes/lottery.py +++ b/files/routes/lottery.py @@ -9,7 +9,6 @@ from files.routes.wrappers import * from files.__main__ import app, limiter @app.post("/lottery/end") -@feature_required('GAMBLING') @admin_level_required(PERMS['LOTTERY_ADMIN']) def lottery_end(v): success, message = end_lottery_session() @@ -17,7 +16,6 @@ def lottery_end(v): @app.post("/lottery/start") -@feature_required('GAMBLING') @admin_level_required(PERMS['LOTTERY_ADMIN']) def lottery_start(v): start_new_lottery_session() @@ -25,7 +23,6 @@ def lottery_start(v): @app.post("/lottery/buy") -@feature_required('GAMBLING') @limiter.limit("3/second;100/minute;500/hour;1000/day") @auth_required def lottery_buy(v): @@ -43,7 +40,6 @@ def lottery_buy(v): @app.get("/lottery/active") -@feature_required('GAMBLING') @limiter.limit("3/second;100/minute;500/hour;1000/day") @auth_required def lottery_active(v): @@ -52,7 +48,6 @@ def lottery_active(v): return {"message": "", "stats": {"user": v.lottery_stats, "lottery": lottery, "participants": participants}} @app.get("/admin/lottery/participants") -@feature_required('GAMBLING') @admin_level_required(PERMS['LOTTERY_VIEW_PARTICIPANTS']) def lottery_admin(v): participants = get_users_participating_in_lottery()