From 97ffc61aa2090aead840533f647aeacf7769034e Mon Sep 17 00:00:00 2001 From: Whyverum Date: Mon, 23 Dec 2024 22:03:04 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D1=87=D0=B8=D0=BA=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B?= =?UTF-8?q?=20/help?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BotCode/keyboards/reply_kb/help_kb.py | 11 +---------- BotCode/routers/commands/user_cmd/help_cmd.py | 10 ++++++---- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/BotCode/keyboards/reply_kb/help_kb.py b/BotCode/keyboards/reply_kb/help_kb.py index ac91539..a52aace 100644 --- a/BotCode/keyboards/reply_kb/help_kb.py +++ b/BotCode/keyboards/reply_kb/help_kb.py @@ -1,4 +1,4 @@ -# BotCode/keyboards/help_kb.py +# BotCode/keyboards/reply_kb/help_kb.py # Создание клавиатуры для сообщения: "Помогите!" from aiogram import Router, F @@ -22,15 +22,6 @@ def get_help_kb() -> ReplyKeyboardMarkup: ] buttons_row = [KeyboardButton(text=num) for num in numbers] - # Один из способов создания клавиатур - - # - # markup = ReplyKeyboardMarkup( - # keyboard=[buttons_row], - # resize_keyboard=True, - # ) - # return markup - builder = ReplyKeyboardBuilder() for num in numbers: builder.button(text=num) diff --git a/BotCode/routers/commands/user_cmd/help_cmd.py b/BotCode/routers/commands/user_cmd/help_cmd.py index 27e0742..c2857cd 100644 --- a/BotCode/routers/commands/user_cmd/help_cmd.py +++ b/BotCode/routers/commands/user_cmd/help_cmd.py @@ -5,11 +5,13 @@ from aiogram import Router, types, F from aiogram.filters import Command from BotLibrary import * from keyboards.reply_kb.help_kb import get_help_kb +from routers.msg_default import msg_default -# Создание роутера и экспорта модулей -__all__ = ("router", "cmd_help", "log_type",) +# Создание роутера, переменных и экспорта модулей +__all__ = ("router", "cmd_help", "log_type", "description") router = Router(name="help_router") log_type = "Help" +description = "Получить помощь" # Список ключевых слов для команды keywords = ["help", "info", "помощь", "инфо", "?", "информация", "рудз", "штащ", "byaj", @@ -17,7 +19,7 @@ keywords = ["help", "info", "помощь", "инфо", "?", "информаци # Хэндлер на команду /info или /help -@router.message(Command(*keywords, prefix=BotEdit.prefixs, ignore_case=True)) +@router.message(Command(*keywords, prefix=BotVariables.prefixs, ignore_case=True)) @router.message(F.text.lower().in_(keywords)) async def cmd_help(message: types.Message): try: @@ -28,7 +30,7 @@ async def cmd_help(message: types.Message): # Активация логгера await cmd_logginger(message, log_type, text) - return text + await msg_default(message) # Проверка на ошибку и ее логирование except Exception as e: