LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-02-17 03:51:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Except MessageIdsEmptyError when getting messages by ID

Browse Source 
This error may occur even when the IDs are not actually empty.
This commit is contained in:
Lonami Exo 2018-12-25 12:17:24 +01:00
parent f73ae42a03
commit a6c3c382b4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
telethon/client/messages.py
View File

@ -8,7 +8,7 @@ from async_generator import async_generator, yield_
from .messageparse import MessageParseMethods from .messageparse import MessageParseMethods
from .uploads import UploadMethods from .uploads import UploadMethods
from .buttons import ButtonMethods from .buttons import ButtonMethods
from .. import helpers, utils from .. import helpers, utils, errors
from ..tl import types, functions from ..tl import types, functions
__log__ = logging.getLogger(__name__) __log__ = logging.getLogger(__name__)
@ -807,7 +807,12 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
from_id = None # By default, no need to validate from_id from_id = None # By default, no need to validate from_id
if isinstance(entity, (types.InputChannel, types.InputPeerChannel)): if isinstance(entity, (types.InputChannel, types.InputPeerChannel)):
r = await self(functions.channels.GetMessagesRequest(entity, ids)) try:
r = await self(
functions.channels.GetMessagesRequest(entity, ids))
except errors.MessageIdsEmptyError:
# All IDs were invalid, use a dummy result
r = types.messages.MessagesNotModified(len(ids))
else: else:
r = await self(functions.messages.GetMessagesRequest(ids)) r = await self(functions.messages.GetMessagesRequest(ids))
if entity: if entity:
@ -822,7 +827,9 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
for x in itertools.chain(r.users, r.chats)} for x in itertools.chain(r.users, r.chats)}
# Telegram seems to return the messages in the order in which # Telegram seems to return the messages in the order in which
# we asked them for, so we don't need to check it ourselves. # we asked them for, so we don't need to check it ourselves,
# unless some messages were invalid in which case Telegram
# may decide to not send them at all.
# #
# The passed message IDs may not belong to the desired entity # The passed message IDs may not belong to the desired entity
# since the user can enter arbitrary numbers which can belong to # since the user can enter arbitrary numbers which can belong to