diff --git a/bot.py b/bot.py index f8e217d4..310fa61d 100644 --- a/bot.py +++ b/bot.py @@ -3,7 +3,6 @@ from aiogram.fsm.storage.memory import MemoryStorage from config import API_TOKEN, CRYPTO_BOT_ENABLE, FREEKASSA_ENABLE, ROBOKASSA_ENABLE, STARS_ENABLE, YOOKASSA_ENABLE from middlewares.admin import AdminMiddleware -from middlewares.database import DatabaseMiddleware from middlewares.logging import LoggingMiddleware from middlewares.user import UserMiddleware @@ -46,10 +45,6 @@ if ROBOKASSA_ENABLE: dp.message.middleware(LoggingMiddleware()) dp.callback_query.middleware(LoggingMiddleware()) - -dp.message.middleware(DatabaseMiddleware()) -dp.callback_query.middleware(DatabaseMiddleware()) - dp.message.middleware(AdminMiddleware()) dp.callback_query.middleware(AdminMiddleware()) diff --git a/handlers/admin/admin_coupons.py b/handlers/admin/admin_coupons.py index 86f581b1..ecc661d5 100644 --- a/handlers/admin/admin_coupons.py +++ b/handlers/admin/admin_coupons.py @@ -5,6 +5,7 @@ from aiogram.types import InlineKeyboardButton from aiogram.utils.keyboard import InlineKeyboardBuilder from database import create_coupon, delete_coupon_from_db, get_all_coupons +from filters.admin import IsAdminFilter from logger import logger @@ -15,7 +16,7 @@ class AdminCouponsState(StatesGroup): router = Router() -@router.callback_query(F.data == "coupons_editor") +@router.callback_query(F.data == "coupons_editor",IsAdminFilter()) async def show_coupon_management_menu(callback_query: types.CallbackQuery): try: await callback_query.message.delete() @@ -38,7 +39,7 @@ async def show_coupon_management_menu(callback_query: types.CallbackQuery): await callback_query.answer() -@router.callback_query(F.data == "coupons") +@router.callback_query(F.data == "coupons",IsAdminFilter()) async def show_coupon_list(callback_query: types.CallbackQuery): try: try: @@ -99,7 +100,7 @@ async def show_coupon_list(callback_query: types.CallbackQuery): await callback_query.answer() -@router.callback_query(F.data.startswith("delete_coupon_")) +@router.callback_query(F.data.startswith("delete_coupon_"),IsAdminFilter()) async def handle_delete_coupon(callback_query: types.CallbackQuery): coupon_code = callback_query.data[len("delete_coupon_") :] @@ -127,7 +128,7 @@ async def handle_delete_coupon(callback_query: types.CallbackQuery): await callback_query.answer() -@router.callback_query(F.data == "create_coupon") +@router.callback_query(F.data == "create_coupon",IsAdminFilter()) async def handle_create_coupon(callback_query: types.CallbackQuery, state: FSMContext): try: await callback_query.message.delete() @@ -144,7 +145,7 @@ async def handle_create_coupon(callback_query: types.CallbackQuery, state: FSMCo await callback_query.answer() -@router.message(AdminCouponsState.waiting_for_coupon_data) +@router.message(AdminCouponsState.waiting_for_coupon_data,IsAdminFilter()) async def process_coupon_data(message: types.Message, state: FSMContext): text = message.text.strip() diff --git a/handlers/admin/admin_panel.py b/handlers/admin/admin_panel.py index 787418f9..1cfa9eab 100644 --- a/handlers/admin/admin_panel.py +++ b/handlers/admin/admin_panel.py @@ -22,9 +22,13 @@ class UserEditorState(StatesGroup): waiting_for_tg_id = State() displaying_user_info = State() +@router.callback_query(F.data == "admin", IsAdminFilter()) +async def handle_admin_callback_query(callback_query: CallbackQuery): + await handle_admin_message(callback_query.message) + @router.message(Command("admin"), F.data == "admin", IsAdminFilter()) -async def handle_admin_command(message: types.Message): +async def handle_admin_message(message: types.Message): builder = InlineKeyboardBuilder() builder.row( InlineKeyboardButton( @@ -50,6 +54,9 @@ async def handle_admin_command(message: types.Message): builder.row( InlineKeyboardButton(text="🔄 Перезагрузить бота", callback_data="restart_bot") ) + builder.row( + InlineKeyboardButton(text="⬅️ Вернуться в профиль", callback_data="view_profile") + ) await bot.send_message( message.chat.id, "🤖 Панель администратора", reply_markup=builder.as_markup() ) diff --git a/handlers/instructions/instructions.jpg b/handlers/instructions/instructions.jpg deleted file mode 100644 index 9c52d9f6..00000000 Binary files a/handlers/instructions/instructions.jpg and /dev/null differ diff --git a/handlers/keys/pic_keys.jpg b/handlers/keys/pic_keys.jpg deleted file mode 100644 index a6ec6b6b..00000000 Binary files a/handlers/keys/pic_keys.jpg and /dev/null differ diff --git a/handlers/keys/pic_view.jpg b/handlers/keys/pic_view.jpg deleted file mode 100644 index 1064f788..00000000 Binary files a/handlers/keys/pic_view.jpg and /dev/null differ diff --git a/handlers/pic.jpg b/handlers/pic.jpg deleted file mode 100644 index 1064f788..00000000 Binary files a/handlers/pic.jpg and /dev/null differ diff --git a/handlers/pic_invite.jpg b/handlers/pic_invite.jpg deleted file mode 100644 index 1064f788..00000000 Binary files a/handlers/pic_invite.jpg and /dev/null differ