From 9e5128547a8c6b668f097f34e42afc52c7966a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joscha=20G=C3=B6tzer?= Date: Tue, 20 Feb 2018 15:20:23 +0100 Subject: [PATCH] Update telegram_client.py Revert layout changes --- telethon/telegram_client.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/telethon/telegram_client.py b/telethon/telegram_client.py index 320d9ff7..c4bb4986 100644 --- a/telethon/telegram_client.py +++ b/telethon/telegram_client.py @@ -324,7 +324,7 @@ class TelegramClient(TelegramBareClient): else: raise RuntimeError( '{} consecutive sign-in attempts failed. Aborting' - .format(max_attempts) + .format(max_attempts) ) if two_step_detected: @@ -591,13 +591,13 @@ class TelegramClient(TelegramBareClient): return update.message elif (isinstance(update, UpdateEditMessage) and - not isinstance(request.peer, InputPeerChannel)): + not isinstance(request.peer, InputPeerChannel)): if request.id == update.message.id: return update.message elif (isinstance(update, UpdateEditChannelMessage) and - utils.get_peer_id(request.peer) == - utils.get_peer_id(update.message.to_id)): + utils.get_peer_id(request.peer) == + utils.get_peer_id(update.message.to_id)): if request.id == update.message.id: return update.message @@ -767,7 +767,7 @@ class TelegramClient(TelegramBareClient): return self(messages.DeleteMessagesRequest(message_ids, revoke=revoke)) def get_message_history(self, entity, limit=20, offset_date=None, - offset_id=0, max_id=0, min_id=0, add_offset=0, + offset_id=0, max_id=0, min_id=0, add_offset=0, batch_size=100, wait_time=None): """ Gets the message history for the specified entity @@ -886,7 +886,7 @@ class TelegramClient(TelegramBareClient): m.message = getattr(m, 'message', None) m.action = getattr(m, 'action', None) m.sender = (None if not m.from_id else - entities[utils.get_peer_id(m.from_id)]) + entities[utils.get_peer_id(m.from_id)]) if getattr(m, 'fwd_from', None): m.fwd_from.sender = ( @@ -1768,7 +1768,6 @@ class TelegramClient(TelegramBareClient): The event builder class or instance to be used, for instance ``events.NewMessage``. """ - def decorator(f): self.add_event_handler(f, event) return f