rebase api file

handlers/buttons/profile.py

@@ -1,7 +1,7 @@
 ADD_SUB = "➕ Подписка"
 MY_SUBS = "📱 Мои подписки"
 BALANCE = "💰 Баланс"
-BALANCE_HISTORY = "📊 История пополнения"
+BALANCE_HISTORY = "📊 История пополнений"
 PAYMENT = "💳 Пополнить баланс"
 INVITE = "👥 Пригласить"
 GIFTS = "🎁 Подарить"

handlers/keys/key_management.py

@@ -12,7 +12,7 @@ from handlers.payments.yookassa_pay import process_custom_amount_input
 from py3xui import AsyncApi
 
 from bot import bot
-from client import delete_client
+from panels.three_xui import delete_client
 from config import (
     ADMIN_PASSWORD,
     ADMIN_USERNAME,
@@ -113,7 +113,7 @@ async def handle_key_creation(
     builder = InlineKeyboardBuilder()
     for index, (plan_id, price) in enumerate(RENEWAL_PRICES.items()):
         discount_text = ""
-        if plan_id in DISCOUNTS:
+        if DISCOUNTS and plan_id in DISCOUNTS:
             discount_percentage = DISCOUNTS[plan_id]
             discount_text = f" ({discount_percentage}% скидка)"
             if index == len(RENEWAL_PRICES) - 1:

handlers/keys/key_utils.py

@@ -7,7 +7,7 @@ from py3xui import AsyncApi
 from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, LIMIT_IP, PUBLIC_LINK, SUPERNODE, TOTAL_GB
 from py3xui import AsyncApi
 
-from client import ClientConfig, add_client, delete_client, extend_client_key, get_client_traffic, toggle_client
+from panels.three_xui import ClientConfig, add_client, delete_client, extend_client_key, get_client_traffic, toggle_client
 from config import ADMIN_PASSWORD, ADMIN_USERNAME, LIMIT_IP, PUBLIC_LINK, SUPERNODE, TOTAL_GB, DATABASE_URL
 from database import get_servers, store_key
 from handlers.utils import get_least_loaded_cluster

handlers/keys/keys.py

@@ -137,7 +137,7 @@ def build_keys_response(records):
 
             response_message += f"• <b>{key_display}</b> ({formatted_date_full})\n"
 
-        response_message += "</blockquote>\n"
+        response_message += "</blockquote>\n\n<i>Нажмите на ✏️, чтобы переименовать подписку.</i>"
     else:
         response_message = NO_SUBSCRIPTIONS_MSG