make check staff level first check cache

MikeyUsersREC · Jan 19, 2025 · a8c88b0 · a8c88b0
1 parent bb4b301
commit a8c88b0
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/utils/api.py b/utils/api.py
@@ -753,28 +753,35 @@ async def POST_check_staff_level(self, request: Request):
         json_data = await request.json()
         guild_id = json_data.get("guild")
         user_id = json_data.get("user")
+
         if not guild_id or not user_id:
-            return HTTPException(status_code=400, detail="Invalid guild")
-
-        try:
-            guild = await self.bot.fetch_guild(guild_id)
-        except (discord.Forbidden, discord.HTTPException):
-            return HTTPException(status_code=400, detail="Invalid guild")
-
-        try:
-            user = await guild.fetch_member(user_id)
-        except (discord.Forbidden, discord.HTTPException):
-            return {"permission_level": 0}
-
+            raise HTTPException(status_code=400, detail="Invalid guild or user ID")
+
+        guild = None
+        user = None
+
+        guild = self.bot.get_guild(guild_id)
+        if not guild:
+            try:
+                guild = await self.bot.fetch_guild(guild_id)
+            except (discord.Forbidden, discord.HTTPException):
+                raise HTTPException(status_code=400, detail="Invalid guild")
+
+        user = guild.get_member(user_id)
+        if not user:
+            try:
+                user = await guild.fetch_member(user_id)
+            except (discord.Forbidden, discord.HTTPException):
+                return {"permission_level": 0}
+
         permission_level = 0
         if await management_check(self.bot, guild, user):
             permission_level = 2
         elif await admin_check(self.bot, guild, user):
             permission_level = 3
         elif await staff_check(self.bot, guild, user):
             permission_level = 1
-
-
+
         return {"permission_level": permission_level}
 
     async def POST_get_guild_settings(self, request: Request):