From 59d584f1c869629acaff5e0089d39c181ee241d5 Mon Sep 17 00:00:00 2001 From: Whyverum Date: Wed, 18 Dec 2024 12:18:26 +0700 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D1=8B=20=D1=81=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BotCode/keyboards/{ => reply_kb}/help_kb.py | 0 BotCode/routers/commands/user_cmd/help_cmd.py | 2 +- BotCode/routers/commands/user_cmd/start_cmd.py | 7 +++++-- 3 files changed, 6 insertions(+), 3 deletions(-) rename BotCode/keyboards/{ => reply_kb}/help_kb.py (100%) diff --git a/BotCode/keyboards/help_kb.py b/BotCode/keyboards/reply_kb/help_kb.py similarity index 100% rename from BotCode/keyboards/help_kb.py rename to BotCode/keyboards/reply_kb/help_kb.py diff --git a/BotCode/routers/commands/user_cmd/help_cmd.py b/BotCode/routers/commands/user_cmd/help_cmd.py index 9178837..27e0742 100644 --- a/BotCode/routers/commands/user_cmd/help_cmd.py +++ b/BotCode/routers/commands/user_cmd/help_cmd.py @@ -4,7 +4,7 @@ from aiogram import Router, types, F from aiogram.filters import Command from BotLibrary import * -from BotCode.keyboards.help_kb import get_help_kb +from keyboards.reply_kb.help_kb import get_help_kb # Создание роутера и экспорта модулей __all__ = ("router", "cmd_help", "log_type",) diff --git a/BotCode/routers/commands/user_cmd/start_cmd.py b/BotCode/routers/commands/user_cmd/start_cmd.py index a44ef7e..a4d73f5 100644 --- a/BotCode/routers/commands/user_cmd/start_cmd.py +++ b/BotCode/routers/commands/user_cmd/start_cmd.py @@ -2,9 +2,9 @@ # Работа с командой /start, для запуска бота from aiogram import Router, types, F -from aiogram.filters import Command +from aiogram.filters import Command, CommandStart from BotLibrary import * -from BotCode.keyboards.start_kb import get_start_kb +from keyboards.reply_kb.start_kb import get_start_kb # Создание роутера и настройка экспорта модулей __all__ = ("router", "cmd_start", "log_type",) @@ -19,12 +19,15 @@ keywords = ["start", "старт", "запуск", "пуск", "on", "вкл", " # Обработчик команды /start @router.message(Command(*keywords, prefix=BotEdit.prefixs, ignore_case=True)) @router.message(F.text.lower().in_(keywords)) +@router.message(CommandStart()) async def cmd_start(message: types.Message): try: # Вывод сообщения пользователю text = f"использовал(а) команду /{log_type.lower()}" await message.reply(text=f"Стартовый бот!", reply_markup=get_start_kb()) + print(f"Текст запроса: {repr(message.text)}") + # Активация логгера await cmd_logginger(message, log_type, text) return text