Merge pull request #1 from teanus/TeaRCON_3.0

3.0

bot.py

@@ -14,31 +14,41 @@
 #    ╚═╝   ╚══════╝╚═╝  ╚═╝╚═╝  ╚═══╝ ╚═════╝ ╚══════╝
 
 
-from aiogram.utils import executor
+import asyncio
+from create_bot import bot, dp
+from routers.admin import admin_router, register_routers as register_admin_handlers
+from routers.client import client_router, register_routers as register_client_handlers
+from routers.other import other_router, register_routers as register_other_handlers
+from routers.common import common_router, register_routers as register_common_handlers
 
-from add_super_admin import console_add_super_admin
-from create_bot import dp
-from handlers import admin, client, common, other
 from logger.log import logger
 
 
-async def on_startup(_) -> None:
+async def on_startup() -> None:
     print("Бот начал работу!")
     logger.info("Бот запущен!")
-    print(await console_add_super_admin())
 
 
-async def on_shutdown(_) -> None:
+async def on_shutdown() -> None:
     print("Бот выключен")
     logger.info("Бот выключен")
 
 
-admin.register_handlers_admin(dp)
-client.register_handlers_client(dp)
-other.register_handlers_other(dp)
-common.register_handlers_common(dp)
+async def main():
+    dp.startup.register(on_startup)
+
+    dp.include_router(other_router)
+    dp.include_router(client_router)
+    dp.include_router(admin_router)
+    dp.include_router(common_router)
+    # Регистрация обработчиков для каждого роутера
+    register_other_handlers()
+    register_client_handlers()
+    register_admin_handlers()
+    register_common_handlers()
+    await bot.delete_webhook(drop_pending_updates=True)
+    await dp.start_polling(bot)
+
 
 if __name__ == "__main__":
-    executor.start_polling(
-        dp, skip_updates=True, on_startup=on_startup, on_shutdown=on_shutdown
-    )
+    asyncio.run(main())

keyboards/kb_admin.py

@@ -16,41 +16,50 @@
 
 from aiogram.types import KeyboardButton, ReplyKeyboardMarkup
 
-button_id = KeyboardButton("🆔айди")
-button_rcon = KeyboardButton("❗ркон")
-button_info = KeyboardButton("🆘инфо")
-button_admin_panel = KeyboardButton("⚙управление")
-button_support = KeyboardButton("🆘поддержка")
-main_menu = ReplyKeyboardMarkup(resize_keyboard=True).add(
-    button_id, button_rcon, button_info, button_support, button_admin_panel
+main_menu = ReplyKeyboardMarkup(
+    resize_keyboard=True,
+    keyboard=[
+        [KeyboardButton(text="🆔 Айди"), KeyboardButton(text="❗ Ркон")],
+        [KeyboardButton(text="🆘 Инфо"), KeyboardButton(text="⚙ Управление")],
+        [KeyboardButton(text="🆘 Поддержка")],
+    ],
 )
 
-button_cancel = KeyboardButton("◀отмена")
-button_panel_roles = KeyboardButton("📝роли")
-button_panel_commands = KeyboardButton("📝команды")
-admin_panel_menu = ReplyKeyboardMarkup(resize_keyboard=True).add(
-    button_panel_roles, button_cancel, button_panel_commands
+admin_panel_menu = ReplyKeyboardMarkup(
+    resize_keyboard=True,
+    keyboard=[
+        [KeyboardButton(text="📝 Роли"), KeyboardButton(text="📝 Команды")],
+        [KeyboardButton(text="◀ Отмена")],
+    ],
 )
 
-button_panel_add_roles = KeyboardButton("📝выдать")
-button_panel_remove_roles = KeyboardButton("📝снять")
-button_back = KeyboardButton("⏹назад")
-roles_panel = ReplyKeyboardMarkup(resize_keyboard=True).add(
-    button_panel_add_roles, button_back, button_panel_remove_roles
+roles_panel = ReplyKeyboardMarkup(
+    resize_keyboard=True,
+    keyboard=[
+        [KeyboardButton(text="📝 Выдать"), KeyboardButton(text="📝 Снять")],
+        [KeyboardButton(text="⏹ Назад")],
+    ],
 )
 
-button_panel_admin = KeyboardButton("🪪админ")
-button_panel_user = KeyboardButton("🪪обычный")
-button_back = KeyboardButton("⏹назад")
-roles_switch_panel = ReplyKeyboardMarkup(resize_keyboard=True).add(
-    button_panel_user, button_back, button_panel_admin
+roles_switch_panel = ReplyKeyboardMarkup(
+    resize_keyboard=True,
+    keyboard=[
+        [KeyboardButton(text="🪪 Админ"), KeyboardButton(text="🪪 Обычный")],
+        [KeyboardButton(text="⏹ Назад")],
+    ],
 )
 
-button_panel_commands_add = KeyboardButton("⛔добавить")
-button_panel_commands_remove = KeyboardButton("🗑удалить")
-button_back = KeyboardButton("⏹назад")
-panel_commands_switch = ReplyKeyboardMarkup(resize_keyboard=True).add(
-    button_panel_commands_add, button_back, button_panel_commands_remove
+panel_commands_switch = ReplyKeyboardMarkup(
+    resize_keyboard=True,
+    keyboard=[
+        [
+            KeyboardButton(text="⛔ Добавить"),
+            KeyboardButton(text="🗑 Удалить"),
+        ],
+        [KeyboardButton(text="⏹ Назад")],
+    ],
+)
+
+admin_back = ReplyKeyboardMarkup(
+    resize_keyboard=True, keyboard=[[KeyboardButton(text="⏹ Назад")]]
 )
-button_back = KeyboardButton("⏹назад")
-admin_back = ReplyKeyboardMarkup(resize_keyboard=True).add(button_back)

keyboards/kb_client.py

@@ -16,13 +16,15 @@
 
 from aiogram.types import KeyboardButton, ReplyKeyboardMarkup
 
-button_id = KeyboardButton("🆔айди")
-button_rcon = KeyboardButton("❗ркон")
-button_info = KeyboardButton("🆘инфо")
-button_support = KeyboardButton("🆘поддержка")
-main_menu = ReplyKeyboardMarkup(resize_keyboard=True).add(
-    button_id, button_rcon, button_info, button_support
+main_menu = ReplyKeyboardMarkup(
+    resize_keyboard=True,
+    keyboard=[
+        [KeyboardButton(text="🆔 Айди"), KeyboardButton(text="❗ Ркон")],
+        [KeyboardButton(text="🆘 Инфо"), KeyboardButton(text="⚙ Управление")],
+        [KeyboardButton(text="🆘 Поддержка")],
+    ],
 )
 
-button_cancel = KeyboardButton("◀отмена")
-rcon_cancel = ReplyKeyboardMarkup(resize_keyboard=True).add(button_cancel)
+rcon_cancel = ReplyKeyboardMarkup(
+    resize_keyboard=True, keyboard=[[KeyboardButton(text="◀ Отмена")]]
+)

keyboards/kb_other.py

@@ -16,10 +16,10 @@
 
 from aiogram.types import KeyboardButton, ReplyKeyboardMarkup
 
-button_id = KeyboardButton("🆔айди")
-button_info = KeyboardButton("🆘инфо")
-button_support = KeyboardButton("🆘поддержка")
-
-main_menu = ReplyKeyboardMarkup(resize_keyboard=True).add(
-    button_id, button_info, button_support
+main_menu = ReplyKeyboardMarkup(
+    resize_keyboard=True,
+    keyboard=[
+        [KeyboardButton(text="🆔 Айди"), KeyboardButton(text="🆘 Инфо")],
+        [KeyboardButton(text="🆘 Поддержка")],
+    ],
 )

logger/group_logger.py

@@ -14,13 +14,18 @@
 #    ╚═╝   ╚══════╝╚═╝  ╚═╝╚═╝  ╚═══╝ ╚═════╝ ╚══════╝
 
 
+from aiogram.exceptions import TelegramAPIError
+
 from create_bot import bot
 from provider import db
 from resources import config
 
 
-async def groups_logger(prefix: str, user_id: str, message: str) -> None:
-    if config.telegram()["on_logger_group"]:
+async def groups_logger(prefix: str, user_id: int, message: str) -> None:
+    if config.telegram().get("on_logger_group"):
         user_type = "Админ" if await db.check_admin_user(user_id) else "Пользователь"
         log_message = f"{prefix} {user_type} с ID {user_id} - ввел команду: {message}"
-        await bot.send_message(config.telegram()["logger_chat_id"], log_message)
+        try:
+            await bot.send_message(config.telegram().get("logger_chat_id"), log_message)
+        except TelegramAPIError as e:
+            print(f"Не удалось отправить сообщение журнала: {e}")