From 5b29fb25c077731d9ef434f4b6657f7f581238df Mon Sep 17 00:00:00 2001 From: Disledg Date: Tue, 7 Jan 2025 14:10:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=B4=D0=B0=D1=87=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8?= =?UTF-8?q?=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handlers/subscriptions.py | 12 ++++++++---- main.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/handlers/subscriptions.py b/handlers/subscriptions.py index d82a9c3..2305ff1 100644 --- a/handlers/subscriptions.py +++ b/handlers/subscriptions.py @@ -44,6 +44,8 @@ def escape_markdown_v2(text: str) -> str: text = text.replace(char, f"\\{char}") return text + + @router.message(Command("subscriptions")) async def supp(message: types.Message): """ @@ -77,9 +79,6 @@ async def supp(message: types.Message): parse_mode=ParseMode.MARKDOWN_V2 ) - - - @router.callback_query(lambda callback: callback.data == "buy_subscription") async def buy_subscription_callback_handler(callback: types.CallbackQuery): """ @@ -156,9 +155,14 @@ async def confirm_callback_handler(callback: types.CallbackQuery): await callback.message.edit_text("Вы уже имеете активную подписку.") else: uri = result.get("message", {}) - await callback.message.edit_text(f"Подписка успешно оформлена!\nВаш конфиг для подключения: ```{uri}```") + escaped_text = escape_markdown_v2(f"Подписка успешно оформлена!") + answer_text = f"Ваш конфиг для подключения: ```{uri}```" + await callback.message.edit_text(escaped_text) + await callback.message.answer(answer_text, parse_mode=ParseMode.MARKDOWN_V2) except Exception as e: logger.exception(f"Ошибка при обработке подтверждения подписки: {e}") await callback.message.edit_text("Произошла ошибка при оформлении подписки.") finally: await callback.answer() + + diff --git a/main.py b/main.py index 32f006c..04735c9 100644 --- a/main.py +++ b/main.py @@ -8,7 +8,7 @@ import logging # Получение токена бота из переменных окружения -BOT_TOKEN = "8104061818:AAF1lx6ii_h2rguzZHEZ49GRv07VYDh1GYo" +BOT_TOKEN = os.getenv("TOKEN") if not BOT_TOKEN: raise ValueError("Не задан токен бота. Убедитесь, что переменная окружения 'TOKEN' установлена.")