diff --git a/app/db/crud/admin.py b/app/db/crud/admin.py index 22d0f7b3b..797aeadb1 100644 --- a/app/db/crud/admin.py +++ b/app/db/crud/admin.py @@ -110,7 +110,7 @@ async def get_admin_by_id(db: AsyncSession, id: int) -> Admin: Returns: Admin: The admin object. """ - admin = (await db.execute(select(Admin).where(Admin.id == id))).first() + admin = (await db.execute(select(Admin).where(Admin.id == id))).scalar_one_or_none() if admin: await load_admin_attrs(admin) return admin @@ -144,7 +144,7 @@ async def get_admin_by_discord_id(db: AsyncSession, discord_id: int) -> Admin: Returns: Admin: The admin object. """ - admin = (await db.execute(select(Admin).where(Admin.discord_id == discord_id))).first() + admin = (await db.execute(select(Admin).where(Admin.discord_id == discord_id))).scalar_one_or_none() if admin: await load_admin_attrs(admin) return admin diff --git a/app/utils/helpers.py b/app/utils/helpers.py index 13e10b96d..ddac2fa35 100644 --- a/app/utils/helpers.py +++ b/app/utils/helpers.py @@ -50,7 +50,7 @@ def default(self, obj): if isinstance(obj, UUID): # if the obj is uuid, we simply return the value of uuid return str(obj) - return super().default(self, obj) + return super().default(obj) def format_validation_error(error: ValidationError) -> str: diff --git a/app/utils/jwt.py b/app/utils/jwt.py index 54adf2c99..29250b0f6 100644 --- a/app/utils/jwt.py +++ b/app/utils/jwt.py @@ -84,9 +84,18 @@ async def get_subscription_payload(token: str) -> dict | None: sha256((u_token + await get_secret_key()).encode("utf-8")).digest(), altchars=b"-_" ).decode("utf-8")[:10] if u_signature == u_token_resign: - u_username = u_token_dec_str.split(",")[0] - u_created_at = int(u_token_dec_str.split(",")[1]) - return {"username": u_username, "created_at": datetime.fromtimestamp(u_created_at, tz=timezone.utc)} + parts = u_token_dec_str.split(",") + if len(parts) != 2: + return + u_username, u_created_at_str = parts + try: + u_created_at = int(u_created_at_str) + except ValueError: + return + return { + "username": u_username, + "created_at": datetime.fromtimestamp(u_created_at, tz=timezone.utc), + } else: return except jwt.exceptions.PyJWTError: diff --git a/app/utils/system.py b/app/utils/system.py index 5fbc20717..68b0be637 100644 --- a/app/utils/system.py +++ b/app/utils/system.py @@ -70,6 +70,7 @@ def get_public_ip(): except httpx.RequestError: pass + sock = None try: sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock.connect(("8.8.8.8", 80)) @@ -79,7 +80,8 @@ def get_public_ip(): except (socket.error, IndexError): pass finally: - sock.close() + if sock: + sock.close() return "127.0.0.1"