diff --git a/handlers/admin/admin_coupons.py b/handlers/admin/admin_coupons.py index 9d4f0b4f..559f336e 100644 --- a/handlers/admin/admin_coupons.py +++ b/handlers/admin/admin_coupons.py @@ -3,7 +3,8 @@ from typing import Any from aiogram import F, Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup -from aiogram.types import Message, CallbackQuery +from aiogram.types import CallbackQuery, Message + from database import create_coupon, delete_coupon, get_all_coupons from filters.admin import IsAdminFilter from keyboards.admin.coupons_kb import AdminCouponDeleteCallback, build_coupons_kb, build_coupons_list_kb @@ -136,9 +137,7 @@ async def handle_coupons_list(callback_query: CallbackQuery, session: Any): AdminCouponDeleteCallback.filter(), IsAdminFilter(), ) -async def handle_coupon_delete( - callback_query: CallbackQuery, callback_data: AdminCouponDeleteCallback, session: Any -): +async def handle_coupon_delete(callback_query: CallbackQuery, callback_data: AdminCouponDeleteCallback, session: Any): coupon_code = callback_data.coupon_code try: diff --git a/handlers/admin/admin_servers.py b/handlers/admin/admin_servers.py index 80d26c00..516fa779 100644 --- a/handlers/admin/admin_servers.py +++ b/handlers/admin/admin_servers.py @@ -4,8 +4,9 @@ import asyncpg from aiogram import F, Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup -from py3xui import AsyncApi from aiogram.types import CallbackQuery, Message +from py3xui import AsyncApi + from backup import create_backup_and_send_to_admins from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL from database import check_unique_server_name, delete_server, get_servers @@ -228,9 +229,7 @@ async def handle_inbound_id_input(message: Message, state: FSMContext): @router.callback_query(AdminServerEditorCallback.filter(F.action == "clusters_manage"), IsAdminFilter()) -async def handle_clusters_manage( - callback_query: CallbackQuery, callback_data: AdminServerEditorCallback, session: Any -): +async def handle_clusters_manage(callback_query: CallbackQuery, callback_data: AdminServerEditorCallback, session: Any): cluster_name = callback_data.data servers = await get_servers(session) @@ -354,9 +353,7 @@ async def handle_servers_add( @router.callback_query(AdminServerEditorCallback.filter(F.action == "clusters_backup"), IsAdminFilter()) -async def handle_clusters_backup( - callback_query: CallbackQuery, callback_data: AdminServerEditorCallback, session: Any -): +async def handle_clusters_backup(callback_query: CallbackQuery, callback_data: AdminServerEditorCallback, session: Any): cluster_name = callback_data.data servers = await get_servers(session) diff --git a/handlers/admin/admin_users.py b/handlers/admin/admin_users.py index a1f8af4c..9cf672dc 100644 --- a/handlers/admin/admin_users.py +++ b/handlers/admin/admin_users.py @@ -131,9 +131,7 @@ async def handle_key_name_input(message: Message, state: FSMContext, session: An AdminUserEditorCallback.filter(F.action == "users_send_message"), IsAdminFilter(), ) -async def handle_send_message( - callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, state: FSMContext -): +async def handle_send_message(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, state: FSMContext): tg_id = callback_data.tg_id await callback_query.message.edit_text( @@ -162,9 +160,7 @@ async def handle_message_text_input(message: Message, state: FSMContext): AdminUserEditorCallback.filter(F.action == "users_trial_restore"), IsAdminFilter(), ) -async def handle_trial_restore( - callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, session: Any -): +async def handle_trial_restore(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, session: Any): tg_id = callback_data.tg_id await update_trial(tg_id, 0, session) diff --git a/handlers/coupons.py b/handlers/coupons.py index 38f992bb..0976d8dc 100644 --- a/handlers/coupons.py +++ b/handlers/coupons.py @@ -3,7 +3,7 @@ from typing import Any from aiogram import F, Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup -from aiogram.types import InlineKeyboardButton, CallbackQuery, Message +from aiogram.types import CallbackQuery, InlineKeyboardButton, Message from aiogram.utils.keyboard import InlineKeyboardBuilder from database import ( diff --git a/handlers/donate.py b/handlers/donate.py index 4e2bbc13..552c4b8d 100644 --- a/handlers/donate.py +++ b/handlers/donate.py @@ -1,7 +1,7 @@ from aiogram import F, Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup -from aiogram.types import InlineKeyboardButton, LabeledPrice, PreCheckoutQuery, Message, CallbackQuery +from aiogram.types import CallbackQuery, InlineKeyboardButton, LabeledPrice, Message, PreCheckoutQuery from aiogram.utils.keyboard import InlineKeyboardBuilder from config import RUB_TO_XTR diff --git a/handlers/instructions/instructions.py b/handlers/instructions/instructions.py index 2e5ff47d..db8ec324 100644 --- a/handlers/instructions/instructions.py +++ b/handlers/instructions/instructions.py @@ -3,7 +3,7 @@ from typing import Any import aiofiles from aiogram import F, Router, types -from aiogram.types import BufferedInputFile, InlineKeyboardButton, Message, CallbackQuery +from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton, Message from aiogram.utils.keyboard import InlineKeyboardBuilder from config import CONNECT_MACOS, CONNECT_WINDOWS, SUPPORT_CHAT_URL diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py index 9d38e657..c15d3ff0 100644 --- a/handlers/keys/keys.py +++ b/handlers/keys/keys.py @@ -8,7 +8,7 @@ import aiofiles import asyncpg import pytz from aiogram import F, Router, types -from aiogram.types import BufferedInputFile, InlineKeyboardButton, Message, CallbackQuery +from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton, Message from aiogram.utils.keyboard import InlineKeyboardBuilder from bot import bot @@ -70,9 +70,7 @@ router = Router() @router.callback_query(F.data == "view_keys") @router.message(F.text == "/subs") -async def process_callback_or_message_view_keys( - callback_query_or_message: Message | CallbackQuery, session: Any -): +async def process_callback_or_message_view_keys(callback_query_or_message: Message | CallbackQuery, session: Any): if isinstance(callback_query_or_message, CallbackQuery): chat_id = callback_query_or_message.message.chat.id send_message = callback_query_or_message.message.answer diff --git a/handlers/profile.py b/handlers/profile.py index 86afb467..7f50cb9b 100644 --- a/handlers/profile.py +++ b/handlers/profile.py @@ -5,7 +5,7 @@ import aiofiles import asyncpg from aiogram import F, Router, types from aiogram.fsm.context import FSMContext -from aiogram.types import BufferedInputFile, InlineKeyboardButton, CallbackQuery, Message +from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton, Message from aiogram.utils.keyboard import InlineKeyboardBuilder from config import DATABASE_URL, NEWS_MESSAGE, RENEWAL_PLANS