From 3cc5bef700b1b92bdd93daee72b46f74d309c91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joscha=20G=C3=B6tzer?= Date: Tue, 20 Feb 2018 04:18:45 +0100 Subject: [PATCH] Update interactive_telegram_client.py Updated as per review --- .../interactive_telegram_client.py | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/telethon_examples/interactive_telegram_client.py b/telethon_examples/interactive_telegram_client.py index 725cf54f..ae868837 100644 --- a/telethon_examples/interactive_telegram_client.py +++ b/telethon_examples/interactive_telegram_client.py @@ -5,7 +5,9 @@ from telethon.utils import get_display_name from telethon import ConnectionMode, TelegramClient from telethon.errors import SessionPasswordNeededError -from telethon.tl.types import (PeerChat, UpdateShortChatMessage, UpdateShortMessage) +from telethon.tl.types import ( + PeerChat, UpdateShortChatMessage, UpdateShortMessage +) def sprint(string, *args, **kwargs): @@ -13,8 +15,8 @@ def sprint(string, *args, **kwargs): try: print(string, *args, **kwargs) except UnicodeEncodeError: - string = string.encode('utf-8', errors='ignore') \ - .decode('ascii', errors='ignore') + string = string.encode('utf-8', errors='ignore')\ + .decode('ascii', errors='ignore') print(string, *args, **kwargs) @@ -182,15 +184,15 @@ class InteractiveTelegramClient(TelegramClient): # Show some information print_title('Chat with "{}"'.format(get_display_name(entity))) print('Available commands:') - print(' !q: Quits the current chat.') - print(' !Q: Quits the current chat and exits.') - print(' !h: prints the latest messages (message History).') - print(' !up : Uploads and sends the Photo from path.') - print(' !uf : Uploads and sends the File from path.') - print(' !d : Deletes a message by its id') - print(' !dm : Downloads the given message Media (if any).') + print(' !q: Quits the current chat.') + print(' !Q: Quits the current chat and exits.') + print(' !h: prints the latest messages (message History).') + print(' !up : Uploads and sends the Photo from path.') + print(' !uf : Uploads and sends the File from path.') + print(' !d : Deletes a message by its id') + print(' !dm : Downloads the given message Media (if any).') print(' !dp: Downloads the current dialog Profile picture.') - print(' !i: prints information about this chat..') + print(' !i: Prints information about this chat..') print() # And start a while loop to chat @@ -235,8 +237,7 @@ class InteractiveTelegramClient(TelegramClient): # And print it to the user sprint('[{}:{}] (ID={}) {}: {}'.format( - msg.date.hour, msg.date.minute, msg.id, name, - content)) + msg.date.hour, msg.date.minute, msg.id, name, content)) # Send photo elif msg.startswith('!up '): @@ -286,7 +287,8 @@ class InteractiveTelegramClient(TelegramClient): print("{:<{width}} : {}".format( attr, getattr(entity, attr, ''), - width=longest_attr)) + width=longest_attr) + ) # Send chat message (if any) elif msg: @@ -374,6 +376,5 @@ class InteractiveTelegramClient(TelegramClient): else: who = self.get_entity(update.from_id) sprint('<< {} @ {} sent "{}"'.format( - get_display_name(which), get_display_name(who), - update.message + get_display_name(which), get_display_name(who), update.message ))