Compare commits
1 Commits
feature/bi
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76daf3244f |
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user