From 3c350c32466bff465e10bc9fe8335fee169d4877 Mon Sep 17 00:00:00 2001 From: Whyverum Date: Wed, 18 Dec 2024 12:16:23 +0700 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BotCode/keyboards/__init__.py | 15 +++++++------- BotCode/keyboards/inline_kb/__init__.py | 14 +++++++++++++ BotCode/keyboards/reply_kb/__init__.py | 20 +++++++++++++++++++ BotCode/routers/__init__.py | 2 ++ BotCode/routers/callback_handlers/__init__.py | 13 ++++++++++++ BotCode/routers/commands/user_cmd/__init__.py | 4 ++++ BotCode/routers/common/__init__.py | 5 +++-- 7 files changed, 63 insertions(+), 10 deletions(-) create mode 100644 BotCode/keyboards/inline_kb/__init__.py create mode 100644 BotCode/keyboards/reply_kb/__init__.py create mode 100644 BotCode/routers/callback_handlers/__init__.py diff --git a/BotCode/keyboards/__init__.py b/BotCode/keyboards/__init__.py index 945b9d5..1c92ca7 100644 --- a/BotCode/keyboards/__init__.py +++ b/BotCode/keyboards/__init__.py @@ -2,19 +2,18 @@ # Инициализация пакета keyboards, для работы с клавиатурами from aiogram import Router -from .start_kb import router as start_kb_router -from .help_kb import router as help_kb_router -from .more_kb import router as more_kb_router - +from .inline_kb import router as inline_kb_router +from .reply_kb import router as reply_kb_router +from .inline_kb import * +from .reply_kb import * # Объявление роутера и настройка экспорта модулей -__all__ = ("router",) +__all__ = ("router", "inline_kb", "reply_kb",) router = Router(name="kb_router") # Список подключаемых роутеров сверху-вниз router.include_routers( - start_kb_router, - help_kb_router, - more_kb_router, + inline_kb_router, + reply_kb_router, ) diff --git a/BotCode/keyboards/inline_kb/__init__.py b/BotCode/keyboards/inline_kb/__init__.py new file mode 100644 index 0000000..1ce98a7 --- /dev/null +++ b/BotCode/keyboards/inline_kb/__init__.py @@ -0,0 +1,14 @@ +# BotCode/keyboards/__init__.py +# Инициализация пакета keyboards, для работы с клавиатурами + +from aiogram import Router +from .actor_kb import * +from .randnum_kb import * + +# Объявление роутера и настройка экспорта модулей +__all__ = ("router", "actor_kb", "ButtonInl") +router = Router(name="inline_kb_router") + + +# Список подключаемых роутеров сверху-вниз +# router.include_routers() diff --git a/BotCode/keyboards/reply_kb/__init__.py b/BotCode/keyboards/reply_kb/__init__.py new file mode 100644 index 0000000..2a26cee --- /dev/null +++ b/BotCode/keyboards/reply_kb/__init__.py @@ -0,0 +1,20 @@ +# BotCode/keyboards/__init__.py +# Инициализация пакета keyboards, для работы с клавиатурами + +from aiogram import Router +from .start_kb import router as start_kb_router +from .help_kb import router as help_kb_router +from .more_kb import router as more_kb_router + + +# Объявление роутера и настройка экспорта модулей +__all__ = ("router",) +router = Router(name="reply_kb_router") + + +# Список подключаемых роутеров сверху-вниз +router.include_routers( + start_kb_router, + help_kb_router, + more_kb_router, +) diff --git a/BotCode/routers/__init__.py b/BotCode/routers/__init__.py index b55d749..6b00bff 100644 --- a/BotCode/routers/__init__.py +++ b/BotCode/routers/__init__.py @@ -3,6 +3,7 @@ # Пакет старых файлов отключен!! from aiogram import Router +from .callback_handlers import router as callback_handlers_router from .commands.bot_command import set_commands from .administration import router as admin_head_router from .commands import router as commands_head_router @@ -17,6 +18,7 @@ router = Router(name="main_router") # Список подключаемых роутеров сверху-вниз router.include_routers( +callback_handlers_router, admin_head_router, commands_head_router, downloads_head_router, diff --git a/BotCode/routers/callback_handlers/__init__.py b/BotCode/routers/callback_handlers/__init__.py new file mode 100644 index 0000000..9e8ad49 --- /dev/null +++ b/BotCode/routers/callback_handlers/__init__.py @@ -0,0 +1,13 @@ +from aiogram import Router + +from .actor_kb_cb import router as actor_kb_cb_router +from .randnum_kb_cb import router as randnum_kb_cb_router + +__all__ = ("router", ) +router = Router(name="callback_handlers") + +# Список подключаемых роутеров сверху-вниз +router.include_routers( + actor_kb_cb_router, + randnum_kb_cb_router, +) diff --git a/BotCode/routers/commands/user_cmd/__init__.py b/BotCode/routers/commands/user_cmd/__init__.py index aa77b3a..2fa3d1d 100644 --- a/BotCode/routers/commands/user_cmd/__init__.py +++ b/BotCode/routers/commands/user_cmd/__init__.py @@ -7,6 +7,8 @@ from .help_cmd import router as help_router from .more_cmd import router as more_router from .exit_cmd import router as exit_router from .start_time_cmd import router as start_time_router +from .actor_cmd import router as actor_router +from .randnum_cmd import router as randnum_router # Объявление роутера и настройка экспорта модулей @@ -20,6 +22,8 @@ router.include_routers( help_router, more_router, exit_router, + actor_router, + randnum_router, ) diff --git a/BotCode/routers/common/__init__.py b/BotCode/routers/common/__init__.py index ae847df..29d9f4a 100644 --- a/BotCode/routers/common/__init__.py +++ b/BotCode/routers/common/__init__.py @@ -3,6 +3,7 @@ from aiogram import Router from .messages import router as common_message_router +from .phrase import router as phrase_message_router # Объявление роутера и настройка экспорта модулей @@ -12,8 +13,8 @@ router = Router(name="users_head_router") # Список подключаемых роутеров сверху-вниз router.include_routers( - common_message_router, + phrase_message_router, ) # Идет самым последним, если другие роутеры не сработали -# router.include_router(common_message_router) +router.include_router(common_message_router)