From 9b39866065bccb785dcb69d57090a3fe515c8a32 Mon Sep 17 00:00:00 2001 From: Whyverum Date: Mon, 23 Dec 2024 22:02:36 +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/actor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BotCode/keyboards/inline_kb/actor_kb.py | 6 +++--- BotCode/routers/callback_handlers/actor_kb_cb.py | 10 +++++++++- BotCode/routers/commands/user_cmd/actor_cmd.py | 8 +++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/BotCode/keyboards/inline_kb/actor_kb.py b/BotCode/keyboards/inline_kb/actor_kb.py index 6d0dce2..ad5271d 100644 --- a/BotCode/keyboards/inline_kb/actor_kb.py +++ b/BotCode/keyboards/inline_kb/actor_kb.py @@ -1,8 +1,8 @@ -# BotCode/keyboards/start_kb.py -# Создания клавиатуры на команду: /start +# BotCode/keyboards/inline_kb/actor_kb.py +# Создания инлайн-клавиатуры на команду: /actor from aiogram import Router -from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton +from aiogram.types import InlineKeyboardMarkup from aiogram.utils.keyboard import InlineKeyboardBuilder # Создание роутера и настройка экспорта diff --git a/BotCode/routers/callback_handlers/actor_kb_cb.py b/BotCode/routers/callback_handlers/actor_kb_cb.py index 6011d7a..d43d1ed 100644 --- a/BotCode/routers/callback_handlers/actor_kb_cb.py +++ b/BotCode/routers/callback_handlers/actor_kb_cb.py @@ -1,11 +1,17 @@ -from random import randint +# BotCode/routers/callback_handlers/actor_kb_cb.py +# Обработчик запросов в команде /actor +from random import randint from aiogram import Router, F from aiogram.types import CallbackQuery from keyboards.inline_kb.actor_kb import ButtonInl +# Создание роутера и настройка экспорта модулей +__all__ = ("router",) router = Router(name="actor_kb_cb_router") + +# Тестирование реферальных ссылок @router.callback_query(F.data == ButtonInl.random_site_cbd) async def random_site_cb(callback_query: CallbackQuery): bot_me = await callback_query.bot.me() @@ -14,6 +20,7 @@ async def random_site_cb(callback_query: CallbackQuery): ) +# Тестирование уведомления для пользователя @router.callback_query(F.data == ButtonInl.random_num_dice_cbd) async def random_num_dice_cb(callback_query: CallbackQuery): await callback_query.answer( @@ -22,6 +29,7 @@ async def random_num_dice_cb(callback_query: CallbackQuery): ) +# Тестирование модального окна для пользователя @router.callback_query(F.data == ButtonInl.random_num_modal_cdb) async def random_num_dice_modal_cb(callback_query: CallbackQuery): await callback_query.answer( diff --git a/BotCode/routers/commands/user_cmd/actor_cmd.py b/BotCode/routers/commands/user_cmd/actor_cmd.py index 140a83b..90c416c 100644 --- a/BotCode/routers/commands/user_cmd/actor_cmd.py +++ b/BotCode/routers/commands/user_cmd/actor_cmd.py @@ -5,11 +5,13 @@ from aiogram import Router, types, F from aiogram.filters import Command from BotLibrary import * from keyboards.inline_kb.actor_kb import get_actor_kb +from routers.msg_default import * -# Создание роутера и настройка экспорта модулей +# Создание роутера, переменных и настройка экспорта модулей __all__ = ("router", "cmd_actor", "log_type",) router = Router(name="actor_router") log_type = "Actor" +description = "Описание" # Список ключевых слов для команды @@ -17,7 +19,7 @@ keywords = ["actor", "фсещк",] # Обработчик команды /actor -@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_actor(message: types.Message): try: @@ -33,7 +35,7 @@ async def cmd_actor(message: types.Message): # Активация логгера await cmd_logginger(message, log_type, text) - return text + await msg_default(message) # Проверка на ошибку и ее логирование except Exception as e: