Skip to content

_ #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SpEcHiDe merged 2 commits into from
Jan 20, 2025
Merged

_ #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc31f57
Try to fix issue #136
SpEcHiDe Jan 20, 2025
e236fe8
testing
SpEcHiDe Jan 20, 2025
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
13 changes: 10 additions & 3 deletions pyrogram/types/messages_and_media/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,14 +885,21 @@ async def _parse(
_requested_users.append(
types.Chat._parse_user_chat(
client,
users.get(raw_peer_id)
users.get(raw_peer_id, raw_peer_id)
)
)
elif isinstance(requested_peer, raw.types.PeerChat):
_requested_chats.append(
types.Chat._parse_chat_chat(
client,
chats.get(raw_peer_id, raw_peer_id)
)
)
else:
_requested_chats.append(
types.Chat._parse_chat(
types.Chat._parse_channel_chat(
client,
chats.get(raw_peer_id)
chats.get(raw_peer_id, raw_peer_id)
)
)

Expand Down
21 changes: 21 additions & 0 deletions pyrogram/types/user_and_chats/chat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,13 @@ def __init__(

@staticmethod
def _parse_user_chat(client, user: raw.types.User) -> "Chat":
if isinstance(user, int):
return Chat(
id=user,
client=client,
_raw=None
)

peer_id = user.id

if isinstance(user, raw.types.UserEmpty):
Expand Down Expand Up @@ -408,6 +415,13 @@ def _parse_user_chat(client, user: raw.types.User) -> "Chat":

@staticmethod
def _parse_chat_chat(client, chat: raw.types.Chat) -> "Chat":
if isinstance(chat, int):
return Chat(
id=-chat,
client=client,
_raw=None
)

peer_id = -chat.id

if isinstance(chat, raw.types.ChatEmpty):
Expand Down Expand Up @@ -444,6 +458,13 @@ def _parse_chat_chat(client, chat: raw.types.Chat) -> "Chat":

@staticmethod
def _parse_channel_chat(client, channel: raw.types.Channel) -> "Chat":
if isinstance(channel, int):
return Chat(
id=utils.get_channel_id(channel),
client=client,
_raw=None
)

peer_id = utils.get_channel_id(channel.id)

if isinstance(channel, raw.types.ChannelForbidden):
Expand Down