Include userIds in log archive mirrors

components/logs.py

@@ -274,8 +274,23 @@ async def EventMirror(
 
         if data is None:
             return
+
+        found: list[str] = []
 
-        result: str = Responses.Log("mirror", f"Mirror of Zeppelin log archive <{url}>")
+        for line in data.splitlines():
+            for find in Utility.FindNumbers(line, 17, 19):
+                if await Utility.IsValidUser(find, client):
+                    found.append(f"`{find}`")
+
+        # Ensure there are no duplicate users
+        found: list[str] = list(set(found))
+
+        result: str = f"Mirror of Zeppelin log archive <{url}>"
+
+        if len(found) > 0:
+            result += f" ({", ".join(found)})"
+
+        result = Responses.Log("mirror", result)
         filename: str = "archive"
 
         try:

components/messages.py

@@ -386,17 +386,9 @@ async def CommandParseUsers(
         return
 
     for result in results:
-        try:
-            logger.debug(
-                f"Validated {result} as user {(await ctx.rest.fetch_user(result)).username}"
-            )
-        except Exception as e:
+        if not await Utility.IsValidUser(result, ctx.client):
             results.remove(result)
 
-            logger.opt(exception=e).debug(
-                f"{result} is not a user ID, removed from results"
-            )
-
     if len(results) == 0:
         await ctx.respond(
             embed=Responses.Warning(

helpers/utils.py

@@ -6,6 +6,7 @@
 from hikari import GatewayBot, Member, NotFoundError
 from httpx import Response
 from loguru import logger
+from tanjun import Client
 
 from .responses import Responses
 
@@ -37,7 +38,7 @@ async def GET(
         try:
             return res.json()
         except Exception as e:
-            logger.opt(exception=e).debug("Failed to parse response as JSON")
+            logger.opt(exception=e).trace("Failed to parse response as JSON")
 
         return res.text
 
@@ -109,6 +110,8 @@ def FindNumbers(
                     if len(entry) > maxLen:
                         continue
 
+                logger.debug(f"Found number {entry} in string {input}")
+
                 results.append(int(entry))
         except Exception as e:
             logger.opt(exception=e).debug("Failed to find numbers in string")
@@ -154,3 +157,18 @@ async def UserHasRole(
             )
 
         return False
+
+    async def IsValidUser(userId: int, client: Client) -> bool:
+        """
+        Determine if the provided integer is a valid
+        Discord user ID.
+        """
+
+        try:
+            logger.debug(f"Validated {userId} as user {(await client.rest.fetch_user(userId)).username}")
+        except Exception as e:
+            logger.opt(exception=e).debug(f"Invalidated potential user ID {userId}")
+
+            return
+
+        return True