Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix get_dialogs breaking in case of empty messages

Browse Source
This commit is contained in:
Dan 2020-12-23 17:20:06 +01:00
parent 19878ae633
commit 4b77bbd468
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pyrogram/methods/chats/get_dialogs.py
View File

@ -92,16 +92,7 @@ class GetDialogs(Scaffold):
if isinstance(message, raw.types.MessageEmpty):
continue
peer_id = message.peer_id
if isinstance(peer_id, raw.types.PeerUser):
if message.out:
chat_id = peer_id.user_id
else:
chat_id = utils.get_raw_peer_id(message.from_id)
else:
chat_id = utils.get_peer_id(peer_id)
chat_id = utils.get_peer_id(message.peer_id)
messages[chat_id] = await types.Message._parse(self, message, users, chats)
parsed_dialogs = []

2
pyrogram/methods/messages/get_messages.py
View File

@ -115,4 +115,4 @@ class GetMessages(Scaffold):
messages = await utils.parse_messages(self, r, replies=replies)
return messages if is_iterable else messages[0]
return messages if is_iterable else messages[0] if messages else None

7
pyrogram/utils.py
View File

@ -91,7 +91,12 @@ async def parse_messages(client, messages: "raw.types.messages.Messages", replie
parsed_messages.append(await types.Message._parse(client, message, users, chats, replies=0))
if replies:
messages_with_replies = {i.id: i.reply_to.reply_to_msg_id for i in messages.messages if i.reply_to}
messages_with_replies = {
i.id: i.reply_to.reply_to_msg_id
for i in messages.messages
if not isinstance(i, raw.types.MessageEmpty) and i.reply_to
}
reply_message_ids = [i[0] for i in filter(lambda x: x[1] is not None, messages_with_replies.items())]
if reply_message_ids: