From 7b94530bfcb283ba3c45e8fd7e6d63da509b8221 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Tue, 27 Mar 2018 11:29:47 +0200 Subject: [PATCH] Move me/self check on get_input_entity to the beginning It would otherwise fail since the addition of getting entity by exact name if someone had 'me' or 'self' as their name. --- telethon/telegram_client.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/telethon/telegram_client.py b/telethon/telegram_client.py index 046838bd..4eb33801 100644 --- a/telethon/telegram_client.py +++ b/telethon/telegram_client.py @@ -2425,6 +2425,9 @@ class TelegramClient(TelegramBareClient): Returns: :tl:`InputPeerUser`, :tl:`InputPeerChat` or :tl:`InputPeerChannel`. """ + if peer in ('me', 'self'): + return InputPeerSelf() + try: # First try to get the entity from cache, otherwise figure it out return self.session.get_input_entity(peer) @@ -2432,8 +2435,6 @@ class TelegramClient(TelegramBareClient): pass if isinstance(peer, str): - if peer in ('me', 'self'): - return InputPeerSelf() return utils.get_input_peer(self._get_entity_from_string(peer)) original_peer = peer