From a710caf86e9f0695af24e07c7721c4c1ae05d962 Mon Sep 17 00:00:00 2001 From: penn5 Date: Wed, 29 Apr 2020 17:13:30 +0100 Subject: [PATCH] Fix global searching with from_user or filter --- telethon/client/messages.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/telethon/client/messages.py b/telethon/client/messages.py index 8237c380..af782e2d 100644 --- a/telethon/client/messages.py +++ b/telethon/client/messages.py @@ -86,14 +86,17 @@ class _MessagesIter(RequestIter): filter = types.InputMessagesFilterEmpty() # Telegram completely ignores `from_id` in private chats - ty = helpers._entity_type(self.entity) - if ty == helpers._EntityType.USER: - # Don't bother sending `from_user` (it's ignored anyway), - # but keep `from_id` defined above to check it locally. - from_user = None + if self.entity: + ty = helpers._entity_type(self.entity) + if ty == helpers._EntityType.USER: + # Don't bother sending `from_user` (it's ignored anyway), + # but keep `from_id` defined above to check it locally. + from_user = None + else: + # Do send `from_user` to do the filtering server-side, + # and set `from_id` to None to avoid checking it locally. + self.from_id = None else: - # Do send `from_user` to do the filtering server-side, - # and set `from_id` to None to avoid checking it locally. self.from_id = None self.request = functions.messages.SearchRequest(