use claim_rewards_all_users everywhere

files/routes/mail.py

@@ -6,7 +6,7 @@ from files.helpers.get import *
 from files.helpers.mail import *
 from files.helpers.useractions import *
 from files.routes.wrappers import *
-from files.routes.users import claim_rewards
+from files.routes.users import claim_rewards_all_users
 from files.__main__ import app, limiter
 
 @app.post("/verify_email")
@@ -50,7 +50,7 @@ def activate(v:User):
 
 	user.email = email
 	user.is_activated = True
-	claim_rewards(user)
+	claim_rewards_all_users()
 
 	badge_grant(user=user, badge_id=2)
 

files/routes/users.py

@@ -1339,8 +1339,10 @@ def bid_list(v:User, bid):
 						)
 
 
-
-def claim_rewards(v):
+def claim_rewards_all_users():
+	emails = [x[0] for x in g.db.query(Transaction.email).filter_by(claimed=None).all()]
+	users = g.db.query(User).filter(User.email.in_(emails)).order_by(User.truescore.desc()).all()
+	for user in users:
 		transactions = g.db.query(Transaction).filter_by(email=v.email, claimed=None).all()
 
 		highest_tier = 0
@@ -1397,14 +1399,6 @@ def claim_rewards(v):
 
 			print(f'@{v.username} rewards claimed successfully!', flush=True)
 
-
-def claim_rewards_all_users():
-	emails = [x[0] for x in g.db.query(Transaction.email).filter_by(claimed=None).all()]
-	users = g.db.query(User).filter(User.email.in_(emails)).order_by(User.truescore.desc()).all()
-	for user in users:
-		claim_rewards(user)
-
-
 KOFI_TOKEN = environ.get("KOFI_TOKEN", "").strip()
 if KOFI_TOKEN:
 	@app.post("/kofi")
@@ -1497,7 +1491,7 @@ def settings_claim_rewards(v:User):
 	if not transactions:
 		abort(400, f"{patron} rewards already claimed!")
 
-	claim_rewards(v)
+	claim_rewards_all_users()
 
 	return {"message": f"{patron} rewards claimed!"}