From 76daf3244f9949ce580b10966f9a700069d54f81 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Nov 2025 20:57:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=87=D1=82=D0=BE=20=D0=B1=D1=8B=20=D1=82=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B1=D0=B5?= =?UTF-8?q?=D0=BA=D0=B5=D0=BD=D0=B4,=20=D0=B2=20=D0=B4=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=B5=D0=B9=D1=88=D0=B5=D0=BC=20=D0=B4=D0=BE=D0=BB=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D1=8B=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=91=D0=BD=20=D0=BD=D0=B0=20=D1=82=D0=BE=20=D1=87?= =?UTF-8?q?=D1=82=D0=BE=20=D0=B4=D0=B5=D0=BB=D0=B0=D0=B5=D1=82=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handlers/profile.py | 6 +++--- handlers/subscriptions.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/handlers/profile.py b/handlers/profile.py index 940ec51..fc20016 100644 --- a/handlers/profile.py +++ b/handlers/profile.py @@ -65,7 +65,7 @@ async def profile_callback_handler(callback: CallbackQuery): await callback.answer() return - sub_data = await call_api("GET", f"/subscription/{user_data['id']}/last") + sub_data = await call_api("GET", f"/subscription/{user_data['telegram_id']}/last") if sub_data == "ERROR" or not isinstance(sub_data, dict): sub_data = None @@ -82,7 +82,7 @@ async def profile_callback_handler(callback: CallbackQuery): "Пополняй баланс и подключай тариф Lark, чтобы получить статус 🐣 или 🦅." ) else: - expiry_date = sub_data.get("expiry_date") + expiry_date = sub_data.get("end_date") formatted_date = ( datetime.fromisoformat(expiry_date).strftime("%d %B %Y г.") if expiry_date @@ -175,7 +175,7 @@ async def tranhist_callback_handler(callback: CallbackQuery): return try: - transactions = await call_api("GET", f"/user/{user_data['id']}/transactions") + transactions = await call_api("GET", f"/user/{user_data['telegram_id']}/transactions") if not transactions: await callback.message.edit_text( "У вас нет транзакций.", reply_markup=tranhist_keyboard() diff --git a/handlers/subscriptions.py b/handlers/subscriptions.py index 2305ff1..e9f1952 100644 --- a/handlers/subscriptions.py +++ b/handlers/subscriptions.py @@ -63,7 +63,7 @@ async def supp(message: types.Message): text = escape_markdown_v2("Произошла ошибка при получении URI") elif uri == "SUB_ERROR": text = escape_markdown_v2("Вы ещё не приобрели подписки!!") - elif "vless" in uri: + elif "trojan" in uri: escaped_uri = escape_markdown_v2(uri) # Экранирование URI text = f"Ваша подписка: ```{escaped_uri}```" else: @@ -142,7 +142,7 @@ async def confirm_callback_handler(callback: types.CallbackQuery): data = callback.data.split(":")[1] tariff_info = data.split("_") plan_id = f"{tariff_info[0]}_{tariff_info[1]}_{tariff_info[2]}" - result = await call_api("POST", "/subscription/buy", {"telegram_id": callback.from_user.id, "plan_id": plan_id}) + result = await call_api("POST", "/subscription/buy", {"telegram_id": callback.from_user.id, "plan_name": "basic"}) detail = result.get("detail", {}) if detail == "ERROR": @@ -154,7 +154,7 @@ async def confirm_callback_handler(callback: types.CallbackQuery): elif detail == "ACTIVE_SUBSCRIPTION_EXISTS": await callback.message.edit_text("Вы уже имеете активную подписку.") else: - uri = result.get("message", {}) + uri = result.get("uri", {}) escaped_text = escape_markdown_v2(f"Подписка успешно оформлена!") answer_text = f"Ваш конфиг для подключения: ```{uri}```" await callback.message.edit_text(escaped_text)