From 86851f2ff391cff8b4ebfac1da4ec7db26429f76 Mon Sep 17 00:00:00 2001 From: Verum Date: Tue, 25 Feb 2025 16:11:39 +0700 Subject: [PATCH] =?UTF-8?q?1.1=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20=D0=BC=D0=BE=D0=B3?= =?UTF-8?q?=D1=83=D1=82=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D1=8C=20=D0=B0=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=B0=D0=BA=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BotCode/routers/commands/user_cmd/help_cmd.py | 2 ++ BotCode/routers/commands/user_cmd/start_cmd.py | 3 +++ BotLibrary/samples/inline_kb_sample.py | 2 +- BotLibrary/samples/user_cmd_class.py | 6 +++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/BotCode/routers/commands/user_cmd/help_cmd.py b/BotCode/routers/commands/user_cmd/help_cmd.py index 4b7539a..5c47b99 100644 --- a/BotCode/routers/commands/user_cmd/help_cmd.py +++ b/BotCode/routers/commands/user_cmd/help_cmd.py @@ -4,6 +4,8 @@ from BotLibrary import CommandHandler from BotCode.keyboards import get_help_kb +# Настройки экспорта в модули +__all__ = ("help_cmd",) # Создание команды /help с нужными параметрами help_cmd = CommandHandler( diff --git a/BotCode/routers/commands/user_cmd/start_cmd.py b/BotCode/routers/commands/user_cmd/start_cmd.py index 27b4e52..62e20bd 100644 --- a/BotCode/routers/commands/user_cmd/start_cmd.py +++ b/BotCode/routers/commands/user_cmd/start_cmd.py @@ -4,6 +4,9 @@ from BotLibrary import CommandHandler from BotCode.keyboards import get_start_kb +# Настройки экспорта в модули +__all__ = ("start_cmd",) + # Создание команды /start с несколькими медиа start_cmd = CommandHandler( name="start", diff --git a/BotLibrary/samples/inline_kb_sample.py b/BotLibrary/samples/inline_kb_sample.py index 75beee7..35424b2 100644 --- a/BotLibrary/samples/inline_kb_sample.py +++ b/BotLibrary/samples/inline_kb_sample.py @@ -24,4 +24,4 @@ class BaseInlineKeyboard: ikb.button(text=text, callback_data=callback_data) ikb.adjust(self.row_width) - return ikb.as_markup() \ No newline at end of file + return ikb.as_markup() diff --git a/BotLibrary/samples/user_cmd_class.py b/BotLibrary/samples/user_cmd_class.py index d5ea90b..2cd90d5 100644 --- a/BotLibrary/samples/user_cmd_class.py +++ b/BotLibrary/samples/user_cmd_class.py @@ -17,7 +17,7 @@ __all__ = ("CommandHandler",) # Класс-шаблон для команд class CommandHandler: - def __init__(self, text_msg, name: str, keywords: list, chat_action: bool = False, + def __init__(self, text_msg, name: str, keywords: list, func = None, chat_action: bool = False, description: str = "Описание команды", tg_links: bool = False, keyboard=None, prefix=BotVar.prefix, callbackdata=None, ignore_case: bool = True, activate_keywoards: bool = True, @@ -38,6 +38,8 @@ class CommandHandler: self.disable_notification = disable_notification self.media = media.lower() + self.func = func + # Поддержка до 10 медиафайлов через список if path_to_media is None: self.path_to_media = [] @@ -63,6 +65,8 @@ class CommandHandler: async def handler(self, message: types.Message): """Основной хэндлер команды.""" try: + if self.func: + await self.func(message) # Вызов переданной функции, если она есть if self.tg_links: self.text_msg = self.text_msg.replace("", str(message.from_user.id))