Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/common/common_api_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down