hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-06-18 19:16:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore iter_messages from_user unless it's a User

Browse Source
This commit is contained in:
Lonami Exo 2018-11-19 08:55:49 +01:00
parent 8ed3ddba31
commit d6ec883cd9
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
telethon/client/messages.py
View File

@ -81,6 +81,7 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
from_user (`entity`): from_user (`entity`):
Only messages from this user will be returned. Only messages from this user will be returned.
This parameter will be ignored if it is not an user.
batch_size (`int`): batch_size (`int`):
Messages will be returned in chunks of this size (100 is Messages will be returned in chunks of this size (100 is
@ -165,7 +166,14 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
else: else:
offset_id = 1 offset_id = 1
from_id = None if not from_user:
from_id = None
else:
from_id = await self.get_input_entity(from_user)
if not isinstance(from_id, (
types.InputPeerUser, types.InputPeerSelf)):
from_id = None # Ignore from_user unless it's a user
limit = float('inf') if limit is None else int(limit) limit = float('inf') if limit is None else int(limit)
if not entity: if not entity:
if reverse: if reverse:
@ -179,7 +187,7 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
offset_id=offset_id, offset_id=offset_id,
limit=1 limit=1
) )
elif search is not None or filter or from_user: elif search is not None or filter or from_id:
if filter is None: if filter is None:
filter = types.InputMessagesFilterEmpty() filter = types.InputMessagesFilterEmpty()
request = functions.messages.SearchRequest( request = functions.messages.SearchRequest(
@ -194,18 +202,19 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
max_id=0, max_id=0,
min_id=0, min_id=0,
hash=0, hash=0,
from_id=( from_id=from_id
await self.get_input_entity(from_user)
if from_user else None
)
) )
if isinstance(entity, types.InputPeerUser):
if not isinstance(entity, (
types.InputPeerUser, types.InputPeerSelf)):
from_id = None
else:
# Telegram completely ignores `from_id` in private # Telegram completely ignores `from_id` in private
# chats, so we need to do this check client-side. # chats, so we need to do this check client-side.
if isinstance(request.from_id, types.InputPeerSelf): if isinstance(from_id, types.InputPeerSelf):
from_id = (await self.get_me(input_peer=True)).user_id from_id = await self.get_peer_id('me')
else: else:
from_id = request.from_id from_id = from_id.user_id
else: else:
request = functions.messages.GetHistoryRequest( request = functions.messages.GetHistoryRequest(
peer=entity, peer=entity,