diff --git a/backup.py b/backup.py index b36a1e30..3acbd3ed 100644 --- a/backup.py +++ b/backup.py @@ -1,9 +1,9 @@ -from loguru import logger import os import subprocess from datetime import datetime from aiogram.types import BufferedInputFile +from loguru import logger from config import ADMIN_ID, BACK_DIR, DB_NAME, DB_PASSWORD, DB_USER diff --git a/client.py b/client.py index cc0ae069..945dd0a1 100644 --- a/client.py +++ b/client.py @@ -1,4 +1,5 @@ import json + from loguru import logger from config import SERVERS diff --git a/handlers/admin/admin.py b/handlers/admin/admin.py index b901e0fe..ed2cd4f2 100644 --- a/handlers/admin/admin.py +++ b/handlers/admin/admin.py @@ -1,9 +1,9 @@ -from loguru import logger from datetime import datetime import asyncpg -from aiogram import Router, types, F +from aiogram import F, Router, types from aiogram.filters import Command +from loguru import logger from auth import login_with_credentials from client import extend_client_key_admin diff --git a/handlers/admin/admin_panel.py b/handlers/admin/admin_panel.py index 9b9a5548..5253c3e5 100644 --- a/handlers/admin/admin_panel.py +++ b/handlers/admin/admin_panel.py @@ -2,7 +2,7 @@ import subprocess from datetime import datetime import asyncpg -from aiogram import Router, types, F +from aiogram import F, Router, types from aiogram.filters import Command from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup diff --git a/handlers/admin/user_editor.py b/handlers/admin/user_editor.py index c16d06aa..f7c69e25 100644 --- a/handlers/admin/user_editor.py +++ b/handlers/admin/user_editor.py @@ -1,5 +1,4 @@ import asyncio -from loguru import logger from datetime import datetime import asyncpg @@ -7,6 +6,7 @@ from aiogram import F, Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup from aiogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup +from loguru import logger from auth import login_with_credentials from bot import bot diff --git a/handlers/commands.py b/handlers/commands.py index de7aece3..e656a1bb 100644 --- a/handlers/commands.py +++ b/handlers/commands.py @@ -1,11 +1,10 @@ -from loguru import logger - import asyncpg from aiogram import F, Router, types from aiogram.filters import Command from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup from aiogram.types import Message +from loguru import logger from bot import bot from config import ADMIN_ID, DATABASE_URL diff --git a/handlers/keys/key_management.py b/handlers/keys/key_management.py index 324c6d22..331c6be0 100644 --- a/handlers/keys/key_management.py +++ b/handlers/keys/key_management.py @@ -1,5 +1,4 @@ import asyncio -from loguru import logger import uuid from datetime import datetime, timedelta @@ -13,6 +12,7 @@ from aiogram.types import ( InlineKeyboardMarkup, Message, ) +from loguru import logger from auth import login_with_credentials from bot import bot, dp diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py index 8d51d62e..ca234ccf 100644 --- a/handlers/keys/keys.py +++ b/handlers/keys/keys.py @@ -1,12 +1,12 @@ import asyncio import locale -from loguru import logger import os from datetime import datetime, timedelta import asyncpg -from aiogram import Router, types, F +from aiogram import F, Router, types from aiogram.types import BufferedInputFile +from loguru import logger from auth import login_with_credentials from bot import bot @@ -41,7 +41,6 @@ locale.setlocale(locale.LC_TIME, "ru_RU.UTF-8") router = Router() - @router.callback_query(F.data == "view_keys") async def process_callback_view_keys(callback_query: types.CallbackQuery): tg_id = callback_query.from_user.id diff --git a/handlers/keys/subscriptions.py b/handlers/keys/subscriptions.py index 8ede7370..734d6893 100644 --- a/handlers/keys/subscriptions.py +++ b/handlers/keys/subscriptions.py @@ -1,8 +1,8 @@ import base64 -from loguru import logger import aiohttp from aiohttp import web +from loguru import logger from config import SERVERS diff --git a/handlers/keys/trial_key.py b/handlers/keys/trial_key.py index 70c87292..69b6e588 100644 --- a/handlers/keys/trial_key.py +++ b/handlers/keys/trial_key.py @@ -1,9 +1,9 @@ import asyncio -from loguru import logger import uuid from datetime import datetime, timedelta import asyncpg +from loguru import logger from auth import login_with_credentials from client import add_client diff --git a/handlers/notifications.py b/handlers/notifications.py index 56813a53..b5401556 100644 --- a/handlers/notifications.py +++ b/handlers/notifications.py @@ -1,10 +1,10 @@ import asyncio -from loguru import logger from datetime import datetime, timedelta import asyncpg from aiogram import Bot, Router, types from aiogram.fsm.state import State, StatesGroup +from loguru import logger from auth import login_with_credentials from client import delete_client, extend_client_key diff --git a/handlers/payment/freekassa_pay.py b/handlers/payment/freekassa_pay.py index cf2cc946..63c67abc 100644 --- a/handlers/payment/freekassa_pay.py +++ b/handlers/payment/freekassa_pay.py @@ -1,14 +1,14 @@ import hashlib -from loguru import logger import time import uuid import requests -from aiogram import Router, types, F +from aiogram import F, Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup from aiohttp import web +from loguru import logger from bot import bot from config import FREEKASSA_API_KEY, FREEKASSA_SHOP_ID diff --git a/handlers/payment/yookassa_pay.py b/handlers/payment/yookassa_pay.py index 433d3935..7f6fe5df 100644 --- a/handlers/payment/yookassa_pay.py +++ b/handlers/payment/yookassa_pay.py @@ -1,11 +1,11 @@ -from loguru import logger import uuid -from aiogram import Router, types, F +from aiogram import F, Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup from aiohttp import web +from loguru import logger from yookassa import Configuration, Payment from bot import bot diff --git a/handlers/profile.py b/handlers/profile.py index 6b3806f0..b6cfb722 100644 --- a/handlers/profile.py +++ b/handlers/profile.py @@ -1,10 +1,10 @@ -from loguru import logger import os -from aiogram import Router, types,F +from aiogram import F, Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup from aiogram.types import BufferedInputFile, InlineKeyboardButton, InlineKeyboardMarkup +from loguru import logger from bot import bot from config import PAYMENT_METHOD @@ -25,7 +25,6 @@ class ReplenishBalanceState(StatesGroup): router = Router() - async def process_callback_view_profile( callback_query: types.CallbackQuery, state: FSMContext ): diff --git a/handlers/start.py b/handlers/start.py index 3c00b6a5..13facc1b 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -1,8 +1,7 @@ -from loguru import logger import os import asyncpg -from aiogram import Router,F +from aiogram import F, Router from aiogram.filters import Command from aiogram.fsm.state import State, StatesGroup from aiogram.types import ( @@ -12,6 +11,7 @@ from aiogram.types import ( InlineKeyboardMarkup, Message, ) +from loguru import logger from bot import bot from config import APP_URL, CHANNEL_URL, DATABASE_URL, SUPPORT_CHAT_URL @@ -19,7 +19,6 @@ from database import add_connection, add_referral, check_connection_exists, get_ from handlers.keys.trial_key import create_trial_key from handlers.texts import ABOUT_VPN, INSTRUCTIONS_TRIAL, WELCOME_TEXT - router = Router() diff --git a/main.py b/main.py index e8c93c1a..8cad306a 100644 --- a/main.py +++ b/main.py @@ -1,9 +1,9 @@ import asyncio -from loguru import logger import signal from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application from aiohttp import web +from loguru import logger from backup import backup_database from bot import bot, dp, router