Modernize bot for Python 3.12

This commit is contained in:
Андрей Цой
2026-07-01 18:24:16 +09:00
parent 733298bf06
commit 3906398136
21 changed files with 263 additions and 161 deletions

12
main.py
View File

@@ -14,7 +14,7 @@ from aiogram.fsm.context import FSMContext
from src.filters.case_insensitive import CaseInsensitiveCommand
from src.core.config import BOT_TOKEN
from src.core.config import BOT_TOKEN, LOG_LEVEL
from src.core.database import async_session_maker
from src.core.scheduler import bot_scheduler
from src.container import container
@@ -34,7 +34,7 @@ from src.handlers.admin_emoji_handlers import router as admin_emoji_router
# Настройка логирования
logging.basicConfig(
level=logging.INFO,
level=getattr(logging, LOG_LEVEL.upper(), logging.INFO),
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
)
logger = logging.getLogger(__name__)
@@ -50,9 +50,9 @@ router = Router()
@dp.callback_query.middleware()
async def log_callback_middleware(handler, event, data):
"""Middleware для логирования всех callback запросов"""
logger.warning(f"🔔 MIDDLEWARE CALLBACK: data='{event.data}', user_id={event.from_user.id}")
logger.debug(f"Callback received: data={event.data!r}, user_id={event.from_user.id}")
result = await handler(event, data)
logger.warning(f"🔔 MIDDLEWARE CALLBACK HANDLED: data='{event.data}', result={result}")
logger.debug(f"Callback handled: data={event.data!r}, result={result}")
return result
@@ -179,7 +179,7 @@ async def btn_my_code(message: Message):
await show_verification_code(message)
@router.message(F.text == "<EFBFBD> Мои логины")
@router.message(F.text == "📱 Мои логины")
async def btn_my_accounts(message: Message):
"""Обработчик кнопки 'Мои логины'"""
from src.handlers.registration_handlers import show_user_accounts
@@ -327,4 +327,4 @@ if __name__ == "__main__":
except KeyboardInterrupt:
logger.info("Бот остановлен пользователем")
except Exception as e:
logger.error(f"Критическая ошибка: {e}")
logger.error(f"Критическая ошибка: {e}")