From bb7fc001cd1bf53f9fa898d18f213f02bc9b2f9a Mon Sep 17 00:00:00 2001
From: Zed <124834187+zZedix@users.noreply.github.com>
Date: Sun, 5 Oct 2025 13:22:40 +0330
Subject: [PATCH 1/4] Improve local IP detection and ensure socket cleanup

---
 app/utils/system.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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"
 

From f602c52a5ff81f89a38df1e06dd3627ad072bf5f Mon Sep 17 00:00:00 2001
From: Zed <124834187+zZedix@users.noreply.github.com>
Date: Sun, 5 Oct 2025 13:31:29 +0330
Subject: [PATCH 2/4] Harden get_subscription_payload against malformed tokens

---
 app/utils/jwt.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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:

From e14e38a6b457b879b6c17406b5e7ce1a3d867dff Mon Sep 17 00:00:00 2001
From: Zed <124834187+zZedix@users.noreply.github.com>
Date: Mon, 6 Oct 2025 01:03:32 +0330
Subject: [PATCH 3/4] Fixed AttributeError in admin CRUD functions

---
 app/db/crud/admin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 4465851a4874a5eb45916ce6623ece70b6e84026 Mon Sep 17 00:00:00 2001
From: Zed <124834187+zZedix@users.noreply.github.com>
Date: Mon, 6 Oct 2025 01:12:46 +0330
Subject: [PATCH 4/4] Fixed TypeError in UUIDEncoder caused by incorrect
 super() call

---
 app/utils/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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: