From 8c7d5ef88bd0d5719eccc8cc7fe8d638a711a397 Mon Sep 17 00:00:00 2001
From: CacucoH <d.yashin@innopolis.university>
Date: Mon, 16 Feb 2026 22:51:11 +0300
Subject: [PATCH] hotfix

---
 src/common/common_api_commands.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/common/common_api_commands.py b/src/common/common_api_commands.py
index 2c80f23..223e50a 100644
--- a/src/common/common_api_commands.py
+++ b/src/common/common_api_commands.py
@@ -232,7 +232,7 @@ async def getUsersByComments(
 
             user, senderUsername = res[0], res[1]
             tqdm.write(
-                f"[+] New user found: {user.full_name} (@{senderUsername or '---'})"
+                f"[+] New user found: {user.full_name} (@{senderUsername or str(user.id)})"
             )
 
         tqdm.write(
@@ -257,18 +257,20 @@ async def search(
 ):
     sender = message.sender  # Optimized
     senderId: int = sender.id
-    senderUsername: str = sender.get("username")
-    if not senderUsername:
-        # Skip to avoid error
-        if isinstance(sender, ChannelForbidden):
-            logging.warning(f"[!] Skipping... megagroup? {senderId} {sender.title}")
-            return None
-
-        # Dont waste API calls on deleted users
-        logging.debug(f"[!] User @{senderId} is deleted? Skipping anyway...")
-        senderUsername = senderId
+    try:
+        senderUsername: str = sender.username
+    except Exception:
+        if not senderUsername:
+            # Skip to avoid error
+            if isinstance(sender, ChannelForbidden):
+                logging.warning(f"[!] Skipping... megagroup? {senderId} {sender.title}")
+                return None
+
+            # Dont waste API calls on deleted users
+            logging.debug(f"[!] User @{senderId} is deleted? Skipping anyway...")
+            senderUsername = senderId
 
-        return None
+            return None
 
     if senderUsername in banned_usernames or str(senderId) in banned_usernames:
         logging.debug(