Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Correct username parsing #1226

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Correct username parsing #1226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion pyrogram/types/user_and_chats/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ def _parse(client, user: "raw.base.User") -> Optional["User"]:
if user is None or isinstance(user, raw.types.UserEmpty):
return None

user_name = user.username if user.username else None

if user_name is None:
for username in user.usernames:
if username.active:
user_name = username.username
break

return User(
id=user.id,
is_self=user.is_self,
Expand All @@ -232,7 +240,7 @@ def _parse(client, user: "raw.base.User") -> Optional["User"]:
first_name=user.first_name,
last_name=user.last_name,
**User._parse_status(user.status, user.bot),
username=user.username,
username=user_name,
language_code=user.lang_code,
emoji_status=types.EmojiStatus._parse(client, user.emoji_status),
dc_id=getattr(user.photo, "dc_id", None),
Expand Down