From 7e41fe054e9d60c6f7e86aadca1b45b51e2bc415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= Date: Sun, 19 Sep 2021 11:48:29 +0200 Subject: [PATCH] autoformat & reasonable /start command --- tgbot/kollagen-bot/main.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/tgbot/kollagen-bot/main.py b/tgbot/kollagen-bot/main.py index d0c3bed..2334937 100644 --- a/tgbot/kollagen-bot/main.py +++ b/tgbot/kollagen-bot/main.py @@ -16,15 +16,6 @@ from telegram.ext import ( ) -def start(update: Update, context: CallbackContext) -> None: - """Send a message when the command /start is issued.""" - user = update.effective_user - update.message.reply_markdown_v2( - fr"Hi {user.mention_markdown_v2()}\!", - reply_markup=ForceReply(selective=True), - ) - - class KollagenBot: def __init__( self, tg_token: str, kollagen_path: str, base_dir: Optional[str] @@ -37,7 +28,7 @@ class KollagenBot: dispatcher = self.updater.dispatcher - dispatcher.add_handler(CommandHandler("start", start)) + dispatcher.add_handler(CommandHandler("start", self.tg_start)) dispatcher.add_handler(CommandHandler("list_modes", self.tg_list_modes)) dispatcher.add_handler(CommandHandler("generate", self.tg_generate)) dispatcher.add_handler(CommandHandler("g", self.tg_generate)) @@ -45,6 +36,10 @@ class KollagenBot: dispatcher.add_handler(CommandHandler("r", self.tg_regenerate)) dispatcher.add_error_handler(self.tg_error) + def tg_start(self, update: Update, context: CallbackContext): + update.message.reply_text("Hi! Check out https://gitlab.com/tmladek/kollagen") + self._process("", update) + def tg_generate(self, update: Update, context: CallbackContext): cmd_line = update.message.text.split(" ")[1:] self._process(cmd_line, update) @@ -58,7 +53,9 @@ class KollagenBot: update.message.reply_text("No previous command to regenerate!") def _process(self, cmd_line: str, update: Update): - self.logger.info(f"Generating from {update.effective_user}, with cmd_line: `{cmd_line}`") + self.logger.info( + f"Generating from {update.effective_user}, with cmd_line: `{cmd_line}`" + ) directories = [ os.path.join(self.base_dir or "./", re.sub(r"[^a-zA-Z0-9]", "", arg)) for arg in cmd_line @@ -88,7 +85,9 @@ class KollagenBot: if isinstance(update, Update): if isinstance(context.error, subprocess.CalledProcessError): - update.message.reply_text(f"Something is fucked!\n{context.error.stderr.decode('utf-8')}") + update.message.reply_text( + f"Something is fucked!\n{context.error.stderr.decode('utf-8')}" + ) else: update.message.reply_text(f"Something is fucked!\n{context.error}")