From 3937cb105c9d9de7edaeb070d3a3b2b405001b3c Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 2 Oct 2024 01:35:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20?= =?UTF-8?q?=D0=B2=20=D1=81=D1=82=D1=83=D1=80=D0=BA=D1=82=D1=83=D1=80=D0=B5?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0,=20isort,=20?= =?UTF-8?q?=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 7 +++---- handlers/balance.py | 10 ---------- .../key_management.py | 1 - handlers/keys.py | 13 ------------- handlers/notifications.py | 18 ++---------------- handlers/pay.py | 13 +++++++------ handlers/profile.py | 2 -- handlers/start.py | 6 +++--- 8 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 handlers/balance.py rename key_management.py => handlers/key_management.py (99%) diff --git a/bot.py b/bot.py index 7c18c5d8..0e93fb3b 100644 --- a/bot.py +++ b/bot.py @@ -9,15 +9,14 @@ storage = MemoryStorage() dp = Dispatcher(bot=bot, storage=storage) router = Router() -from handlers import balance, keys, notifications, pay, profile, start -from key_management import router as key_management_router +from handlers import key_management, keys, notifications, pay, profile, start +from handlers.key_management import router as key_management_router # Регистрация обработчиков dp.include_router(start.router) dp.include_router(profile.router) dp.include_router(keys.router) -dp.include_router(balance.router) -dp.include_router(key_management_router) +dp.include_router(key_management.router) dp.include_router(pay.router) dp.include_router(notifications.router) diff --git a/handlers/balance.py b/handlers/balance.py deleted file mode 100644 index 1ee5eb8c..00000000 --- a/handlers/balance.py +++ /dev/null @@ -1,10 +0,0 @@ -import aiosqlite -from aiogram import Router, types - -router = Router() - -@router.callback_query(lambda c: c.data == 'view_balance') -async def process_callback_view_balance(callback_query: types.CallbackQuery): - tg_id = callback_query.from_user.id - - diff --git a/key_management.py b/handlers/key_management.py similarity index 99% rename from key_management.py rename to handlers/key_management.py index 0b181b10..4a1b54fd 100644 --- a/key_management.py +++ b/handlers/key_management.py @@ -1,4 +1,3 @@ -import asyncio import re import uuid from datetime import datetime, timedelta diff --git a/handlers/keys.py b/handlers/keys.py index 07bd5d30..10a12eee 100644 --- a/handlers/keys.py +++ b/handlers/keys.py @@ -11,19 +11,6 @@ from database import get_balance, update_balance router = Router() -from datetime import datetime, timedelta - -import asyncpg -from aiogram import Router, types - -from auth import login_with_credentials -from bot import bot -from client import delete_client, extend_client_key -from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL -from database import get_balance, update_balance - -router = Router() - # Обработка запроса на просмотр ключей @router.callback_query(lambda c: c.data == 'view_keys') async def process_callback_view_keys(callback_query: types.CallbackQuery): diff --git a/handlers/notifications.py b/handlers/notifications.py index e2ebddb0..31dc7bf0 100644 --- a/handlers/notifications.py +++ b/handlers/notifications.py @@ -1,33 +1,19 @@ from datetime import datetime, timedelta import asyncpg -from aiogram import Bot, Router, types -from aiogram.filters import Command -from aiogram.fsm.context import FSMContext +from aiogram import Bot, Router from aiogram.fsm.state import State, StatesGroup from aiogram.types import ( # Импортируем необходимые классы InlineKeyboardButton, InlineKeyboardMarkup) from bot import bot -from config import ADMIN_ID, DATABASE_URL -from database import get_all_users +from config import DATABASE_URL router = Router() class NotificationStates(StatesGroup): waiting_for_notification_text = State() -from datetime import datetime, timedelta - -import asyncpg -from aiogram import Bot, Router, types -from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup - -from bot import bot -from config import DATABASE_URL - -router = Router() - async def notify_expiring_keys(bot: Bot): try: conn = await asyncpg.connect(DATABASE_URL) diff --git a/handlers/pay.py b/handlers/pay.py index a9e19620..901cf5b7 100644 --- a/handlers/pay.py +++ b/handlers/pay.py @@ -1,17 +1,18 @@ +import logging +import uuid + import asyncpg from aiogram import Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup -from yookassa import Configuration, Payment # Импортируем ЮKассу from aiohttp import web -import logging -import uuid +from yookassa import Configuration, Payment # Импортируем ЮKассу from bot import bot -from config import YOOKASSA_SECRET_KEY, YOOKASSA_SHOP_ID -from database import (add_connection, check_connection_exists, get_balance, - get_key_count, update_balance) +from config import YOOKASSA_SECRET_KEY, YOOKASSA_SHOP_ID +from database import (add_connection, check_connection_exists, get_key_count, + update_balance) from handlers.profile import process_callback_view_profile router = Router() diff --git a/handlers/profile.py b/handlers/profile.py index 260d47cb..e3643d2b 100644 --- a/handlers/profile.py +++ b/handlers/profile.py @@ -1,5 +1,3 @@ -from datetime import datetime - from aiogram import Router, types from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup diff --git a/handlers/start.py b/handlers/start.py index c47f7e0a..8888d894 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -1,14 +1,14 @@ import os -from aiogram import Router, types +from aiogram import Router from aiogram.filters import Command -from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup from aiogram.types import (BufferedInputFile, CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup, Message) from bot import bot -from config import ADMIN_ID, CHANNEL_URL, SUPPORT_CHAT_URL # Добавьте SUPPORT_CHAT_URL +from config import (ADMIN_ID, CHANNEL_URL, # Добавьте SUPPORT_CHAT_URL + SUPPORT_CHAT_URL) router = Router()