From 8eb76ff9e49a69cabff416a820829bd7aa55d853 Mon Sep 17 00:00:00 2001 From: Vladless Date: Wed, 30 Oct 2024 18:03:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=BA?= =?UTF-8?q?=D0=B8.=20=D0=9F=D0=BE=D0=BB=D0=BD=D0=B0=D1=8F=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handlers/keys/key_management.py | 4 ++-- handlers/keys/keys.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handlers/keys/key_management.py b/handlers/keys/key_management.py index 1badcba6..e50ff7bf 100644 --- a/handlers/keys/key_management.py +++ b/handlers/keys/key_management.py @@ -9,7 +9,7 @@ from aiogram.fsm.state import State, StatesGroup from aiogram.types import (CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup, Message) -from auth import link, login_with_credentials +from auth import login_with_credentials, link_subscription from client import add_client from config import (ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, SERVERS) @@ -170,7 +170,7 @@ async def handle_key_name_input(message: Message, state: FSMContext): else: raise Exception(error_msg) - connection_link = await link(session, server_id, client_id, email) + connection_link = await link_subscription(email, server_id) conn = await asyncpg.connect(DATABASE_URL) try: diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py index a7030cfb..3c2a0672 100644 --- a/handlers/keys/keys.py +++ b/handlers/keys/keys.py @@ -4,7 +4,7 @@ from datetime import datetime, timedelta import asyncpg from aiogram import Router, types -from auth import link, login_with_credentials +from auth import login_with_credentials, link_subscription from bot import bot from client import add_client, delete_client, extend_client_key from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, SERVERS @@ -331,7 +331,7 @@ async def process_callback_select_server(callback_query: types.CallbackQuery): if not new_client_data: raise Exception("Ошибка при создании клиента на новом сервере.") - new_key = await link(session_new, server_id, client_id, email) + new_key = await link_subscription(email, server_id) await conn.execute( 'UPDATE keys SET server_id = $1, key = $2 WHERE client_id = $3',