LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-11-04 01:47:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prevent KeyError in forward_messages

Browse Source
This commit is contained in:
Lonami Exo 2018-12-20 20:33:25 +01:00
parent d3feaeedb2
commit 2aa089f29c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
telethon/client/messageparse.py
View File

@ -115,7 +115,7 @@ class MessageParseMethods(UserMethods):
for x in for x in
itertools.chain(result.users, result.chats)} itertools.chain(result.users, result.chats)}
else: else:
return return None
found = None found = None
for update in updates: for update in updates:
@ -141,5 +141,7 @@ class MessageParseMethods(UserMethods):
if found: if found:
found._finish_init(self, entities, input_chat) found._finish_init(self, entities, input_chat)
return found return found
else:
return None # explicit is better than implicit
# endregion # endregion

13
telethon/client/messages.py
View File

@ -553,6 +553,10 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
Returns: Returns:
The list of forwarded `telethon.tl.custom.message.Message`, The list of forwarded `telethon.tl.custom.message.Message`,
or a single one if a list wasn't provided as input. or a single one if a list wasn't provided as input.
Note that if all messages are invalid (i.e. deleted) the call
will fail with ``MessageIdInvalidError``. If only some are
invalid, the list will have ``None`` instead of those messages.
""" """
single = not utils.is_list_like(messages) single = not utils.is_list_like(messages)
if single: if single:
@ -597,7 +601,14 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
update.message._finish_init(self, entities, entity) update.message._finish_init(self, entities, entity)
id_to_message[update.message.id] = update.message id_to_message[update.message.id] = update.message
result = [id_to_message[random_to_id[rnd]] for rnd in req.random_id] # Trying to forward only deleted messages causes `MESSAGE_ID_INVALID`
# but forwarding valid and invalid messages in the same call makes the
# call succeed, although the API won't return those messages thus
# `random_to_id[rnd]` would `KeyError`. Check the key beforehand.
result = [id_to_message[random_to_id[rnd]]
if rnd in random_to_id else None
for rnd in req.random_id]
return result[0] if single else result return result[0] if single else result
async def edit_message( async def edit_message(