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

Fix messages.search accidentally being used over getHistory

Browse Source 
Introduced by 668dcd52ca (this commit
did change a lot more than it should have); the condition for search
was never updated to account for the non-None value.

Closes #1693.
This commit is contained in:
Lonami Exo 2021-02-08 22:56:27 +01:00
parent acb066ad2e
commit 23041f398b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
telethon/client/messages.py
View File

@ -70,6 +70,8 @@ class _MessagesIter(RequestIter):
if filter is None: if filter is None:
filter = types.InputMessagesFilterEmpty() filter = types.InputMessagesFilterEmpty()
else:
filter = filter() if isinstance(filter, type) else filter
if not self.entity: if not self.entity:
self.request = functions.messages.SearchGlobalRequest( self.request = functions.messages.SearchGlobalRequest(
@ -94,7 +96,7 @@ class _MessagesIter(RequestIter):
min_id=0, min_id=0,
hash=0 hash=0
) )
elif search is not None or filter or from_user: elif search is not None or not isinstance(filter, types.InputMessagesFilterEmpty) or from_user:
# Telegram completely ignores `from_id` in private chats # Telegram completely ignores `from_id` in private chats
ty = helpers._entity_type(self.entity) ty = helpers._entity_type(self.entity)
if ty == helpers._EntityType.USER: if ty == helpers._EntityType.USER:
@ -109,7 +111,7 @@ class _MessagesIter(RequestIter):
self.request = functions.messages.SearchRequest( self.request = functions.messages.SearchRequest(
peer=self.entity, peer=self.entity,
q=search or '', q=search or '',
filter=filter() if isinstance(filter, type) else filter, filter=filter,
min_date=None, min_date=None,
max_date=offset_date, max_date=offset_date,
offset_id=offset_id, offset_id=offset_id,