From 11e4cfc5f786575be3aae007e3827793d5b1c315 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 2 Jan 2022 02:26:34 +0200
Subject: [PATCH] fds

---
 files/routes/admin.py  | 2 +-
 files/routes/awards.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/routes/admin.py b/files/routes/admin.py
index d32c7bd92..b053a1bbe 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -190,7 +190,7 @@ def remove_meme_admin(v, username):
 def monthly(v):
 	if request.host == 'rdrama.net' and v.id != 1: abort (403)
 
-	thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).one_or_none().id
+	thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).first().id
 
 	data = {'access_token': GUMROAD_TOKEN}
 
diff --git a/files/routes/awards.py b/files/routes/awards.py
index b3119be1d..330133bbc 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -146,7 +146,7 @@ def buy(v, award):
 	if award == "lootbox":
 		send_repeatable_notification(995, f"@{v.username} bought a lootbox!")
 		for i in [1,2,3,4,5]:
-			thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).one_or_none().id
+			thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).first().id
 			thing += 1
 			award = random.choice(["snow", "gingerbread", "lights", "candycane", "fireplace"])
 			award = AwardRelationship(id=thing, user_id=v.id, kind=award)
@@ -167,7 +167,7 @@ def buy(v, award):
 			send_notification(v.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
 
 	else:
-		thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).one_or_none().id
+		thing = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).first().id
 		thing += 1
 		award = AwardRelationship(id=thing, user_id=v.id, kind=award)
 		g.db.add(award)
@@ -547,7 +547,7 @@ def admin_userawards_post(v):
 
 	notify_awards = {}
 
-	latest = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).one_or_none()
+	latest = g.db.query(AwardRelationship).order_by(AwardRelationship.id.desc()).first()
 	thing = latest.id
 
 	for key, value in request.values.items():