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

Validate to_id when iterating over messages by ID

Browse Source
This commit is contained in:
Lonami Exo 2018-06-17 11:57:11 +02:00
parent 226c35ff8f
commit b65cbd8647
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
telethon/client/messages.py
View File

@ -634,10 +634,13 @@ class MessageMethods(UploadMethods, MessageParseMethods):
if total: if total:
total[0] = len(ids) total[0] = len(ids)
from_id = None # By default, no need to validate from_id
if isinstance(entity, types.InputPeerChannel): if isinstance(entity, types.InputPeerChannel):
r = await self(functions.channels.GetMessagesRequest(entity, ids)) r = await self(functions.channels.GetMessagesRequest(entity, ids))
else: else:
r = await self(functions.messages.GetMessagesRequest(ids)) r = await self(functions.messages.GetMessagesRequest(ids))
if entity:
from_id = utils.get_peer_id(entity)
if isinstance(r, types.messages.MessagesNotModified): if isinstance(r, types.messages.MessagesNotModified):
for _ in ids: for _ in ids:
@ -649,8 +652,13 @@ class MessageMethods(UploadMethods, MessageParseMethods):
# 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.
#
# The passed message IDs may not belong to the desired entity
# since the user can enter arbitrary numbers which can belong to
# arbitrary chats. Validate these unless ``from_id is None``.
for message in r.messages: for message in r.messages:
if isinstance(message, types.MessageEmpty): if isinstance(message, types.MessageEmpty) or (
from_id and utils.get_peer_id(message.to_id) != from_id):
await yield_(None) await yield_(None)
else: else:
await yield_(custom.Message(self, message, entities, entity)) await yield_(custom.Message(self, message, entities, entity))