diff --git a/back/tgbot/tgbot.py b/back/tgbot/tgbot.py index 235c2b1..32a59af 100644 --- a/back/tgbot/tgbot.py +++ b/back/tgbot/tgbot.py @@ -85,7 +85,16 @@ class TgBot: ) TgBot.app.add_handler(CommandHandler("my", self.my, filters.ChatType.PRIVATE)) TgBot.app.add_handler(CommandHandler("inv", self.inv, filters.ChatType.PRIVATE)) - TgBot.app.add_handler(MessageHandler(filters.ChatType.PRIVATE, self.inv)) + TgBot.app.add_handler( + MessageHandler( + ( + filters.ChatType.PRIVATE + & ~filters.COMMAND + & (filters.TEXT | filters.PHOTO) + ), + self.inv, + ) + ) TgBot.app.add_handler(CallbackQueryHandler(self.get_inv, r"get_inv@(.*?)")) TgBot.app.add_handler(CallbackQueryHandler(self.add_tmc, r"add_tmc@(.*?)")) TgBot.app.add_handler( @@ -335,9 +344,13 @@ class TgBot: element.text = update.message.text await element.asave() - await update.effective_message.reply_markdown_v2('Изображение сохранено' if update.message.photo else 'Текст сохранен') - - empty_fields = await tmc_element.field.filter(text=None, file_id=None).acount() + await update.effective_message.reply_markdown_v2( + "Изображение сохранено" if update.message.photo else "Текст сохранен" + ) + + empty_fields = await tmc_element.field.filter( + text=None, file_id=None + ).acount() if empty_fields > 0: context.chat_data["step"] = "add_tmc" await self.inv(update, context)