From d00fef9faf93daf4b1b119d9df2fdfc6cc7084d9 Mon Sep 17 00:00:00 2001 From: Aevann Date: Thu, 26 Jan 2023 11:25:28 +0000 Subject: [PATCH] use transactions table in rdrama (#99) Co-authored-by: Aevann Reviewed-on: https://fsdfsd.net/rDrama/rDrama/pulls/99 --- files/classes/__init__.py | 3 +-- files/routes/settings.py | 2 +- files/routes/users.py | 36 ++++++++++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/files/classes/__init__.py b/files/classes/__init__.py index 66ecf3789..e528d90bb 100644 --- a/files/classes/__init__.py +++ b/files/classes/__init__.py @@ -29,8 +29,7 @@ from .lottery import * from .casino_game import * from .hats import * from .marsey import * -if KOFI_TOKEN: - from .transactions import * +from .transactions import * from .sub_logs import * from .media import * from .push_subscriptions import * diff --git a/files/routes/settings.py b/files/routes/settings.py index ddea01c86..d804e075d 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -404,7 +404,7 @@ def themecolor(v): @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @limiter.limit(DEFAULT_RATELIMIT_SLOWER, key_func=get_ID) @auth_required -def gumroad(v): +def settings_gumroad(v): if GUMROAD_TOKEN == DEFAULT_CONFIG_VALUE: abort(404) if not (v.email and v.is_activated): abort(400, f"You must have a verified email to verify {patron} status and claim your rewards!") diff --git a/files/routes/users.py b/files/routes/users.py index 785098358..b93dc30cd 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -1277,7 +1277,7 @@ def bid_list(v:User, bid): -kofi_tiers={ +tiers={ 3: 1, 5: 1, 10: 2, @@ -1295,7 +1295,7 @@ def claim_rewards(v): marseybux = 0 for transaction in transactions: - tier = kofi_tiers[transaction.amount] + tier = tiers[transaction.amount] marseybux += marseybux_li[tier] if tier > highest_tier: highest_tier = tier @@ -1347,6 +1347,38 @@ def kofi(): return '' +@app.post("/gumroad") +def gumroad(): + data = request.values + ip = request.headers.get('CF-Connecting-IP') + if ip != '34.193.146.117': + print('\n\n\n-----------------------\n\n\ngumroad: ' + ip + '\n\n\n-----------------------\n\n\n') + abort(400) + + id = data['sale_id'] + created_utc = time.time() + type = data['recurrence'] + amount = int(data['price']) + email = data['email'] + + transaction = Transaction( + id=id, + created_utc=created_utc, + type=type, + amount=amount, + email=email + ) + + g.db.add(transaction) + + user = g.db.query(User).filter_by(email=email, is_activated=True).order_by(User.truescore.desc()).first() + # if user: + # claim_rewards(user) + + return '' + + + @app.post("/settings/kofi") @limiter.limit(DEFAULT_RATELIMIT_SLOWER)