From bcc7760f42a6a73e68b3696b88ca6c854b37c596 Mon Sep 17 00:00:00 2001 From: Vlad Date: Sat, 21 Sep 2024 01:29:33 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=BF=D0=BE?= =?UTF-8?q?=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auth.py | 1 - database.py | 2 +- handlers/keys.py | 2 +- handlers/pay.py | 1 - handlers/start.py | 7 +++---- key_management.py | 3 +-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/auth.py b/auth.py index 2c0f1443..8827e109 100644 --- a/auth.py +++ b/auth.py @@ -1,7 +1,6 @@ import requests from config import ADMIN_USERNAME, ADMIN_PASSWORD, GET_INBOUNDS_URL import json -import httpx session = None diff --git a/database.py b/database.py index 983762fe..4e620f18 100644 --- a/database.py +++ b/database.py @@ -1,6 +1,6 @@ import asyncpg from datetime import datetime -from config import DATABASE_URL # Example: "postgresql://user:password@localhost:5432/dbname" +from config import DATABASE_URL async def init_db(): conn = await asyncpg.connect(DATABASE_URL) diff --git a/handlers/keys.py b/handlers/keys.py index e67205ee..21f8dc55 100644 --- a/handlers/keys.py +++ b/handlers/keys.py @@ -2,7 +2,7 @@ import asyncpg from aiogram import types, Router from bot import bot from datetime import datetime, timedelta -from database import get_balance, update_balance, get_trial +from database import get_balance, update_balance from client import extend_client_key from config import ADMIN_USERNAME, DATABASE_URL, ADMIN_PASSWORD from auth import login_with_credentials diff --git a/handlers/pay.py b/handlers/pay.py index 5d7be13c..5cf2db2e 100644 --- a/handlers/pay.py +++ b/handlers/pay.py @@ -2,7 +2,6 @@ from aiogram import types, Router from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup -import aiosqlite from config import ADMIN_ID, DATABASE_URL from database import get_balance, update_balance, get_key_count from bot import bot diff --git a/handlers/start.py b/handlers/start.py index af3521cc..40ae355f 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -1,11 +1,10 @@ -from aiogram import Bot, Dispatcher, Router, types +from aiogram import Router, types from aiogram.filters import Command from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup, CallbackQuery, Message, ReplyKeyboardMarkup, KeyboardButton -from aiogram.fsm.storage.memory import MemoryStorage from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup -from config import API_TOKEN, ADMIN_ID, CHANNEL_URL -from bot import dp, bot # Убедитесь, что bot и dp импортируются из правильного места +from config import ADMIN_ID, CHANNEL_URL +from bot import bot # Убедитесь, что bot и dp импортируются из правильного места router = Router() diff --git a/key_management.py b/key_management.py index f6a3d9df..d10d57fb 100644 --- a/key_management.py +++ b/key_management.py @@ -2,8 +2,7 @@ import re import uuid import asyncio from datetime import datetime, timedelta -from aiogram import Bot, Dispatcher, Router, types, F -from aiogram.filters import Command +from aiogram import Router, types, F from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup, CallbackQuery, Message from aiogram.fsm.context import FSMContext from aiogram.fsm.state import State, StatesGroup