austnv/remnawave-minishop
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Refactor trial confirmation and activation handlers to utilize new keyboard options

Browse Source 
- Updated the trial confirmation and activation handlers to use a dynamic reply markup based on activation status, improving user interaction.
- Enhanced localization for trial activation details in both English and Russian, providing clearer messaging about trial status and connection instructions.
- Ensured consistency in the user experience across different scenarios by integrating the new keyboard options.
This commit is contained in:
machka-pasla
2025-08-30 13:29:42 +03:00
parent e74f801aec
commit 56fc88c10e
3 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bot/handlers/user/trial_handler.py
+27 -12
View File
@@ -11,6 +11,7 @@ from bot.services.notification_service import NotificationService
from bot.keyboards.inline.user_keyboards import (
get_trial_confirmation_keyboard,
get_main_menu_inline_keyboard,
get_connect_and_main_keyboard,
)
from bot.middlewares.i18n import JsonI18n
from .start import send_main_menu
@@ -75,6 +76,7 @@ async def request_trial_confirmation_handler(
final_message_text_in_chat = ""
show_trial_button_after_action = False
config_link_for_trial = None
if activation_result and activation_result.get("activated"):
try:
@@ -130,13 +132,21 @@ async def request_trial_confirmation_handler(
):
show_trial_button_after_action = True
reply_markup = (
get_connect_and_main_keyboard(
current_lang, i18n, settings, config_link_for_trial
)
if activation_result and activation_result.get("activated")
else get_main_menu_inline_keyboard(
current_lang, i18n, settings, show_trial_button_after_action
)
)
try:
await callback.message.edit_text(
final_message_text_in_chat,
parse_mode="HTML",
reply_markup=get_main_menu_inline_keyboard(
current_lang, i18n, settings, show_trial_button_after_action
),
reply_markup=reply_markup,
disable_web_page_preview=True,
)
except Exception as e_edit:
@@ -148,9 +158,7 @@ async def request_trial_confirmation_handler(
await callback.message.answer(
final_message_text_in_chat,
parse_mode="HTML",
reply_markup=get_main_menu_inline_keyboard(
current_lang, i18n, settings, show_trial_button_after_action
),
reply_markup=reply_markup,
disable_web_page_preview=True,
)
@@ -205,6 +213,7 @@ async def confirm_activate_trial_handler(
final_message_text_in_chat = ""
show_trial_button_after_action = False
config_link_for_trial = None
if activation_result and activation_result.get("activated"):
try:
@@ -256,13 +265,21 @@ async def confirm_activate_trial_handler(
):
show_trial_button_after_action = True
reply_markup = (
get_connect_and_main_keyboard(
current_lang, i18n, settings, config_link_for_trial
)
if activation_result and activation_result.get("activated")
else get_main_menu_inline_keyboard(
current_lang, i18n, settings, show_trial_button_after_action
)
)
try:
await callback.message.edit_text(
final_message_text_in_chat,
parse_mode="HTML",
reply_markup=get_main_menu_inline_keyboard(
current_lang, i18n, settings, show_trial_button_after_action
),
reply_markup=reply_markup,
disable_web_page_preview=True,
)
except Exception as e_edit:
@@ -274,9 +291,7 @@ async def confirm_activate_trial_handler(
await callback.message.answer(
final_message_text_in_chat,
parse_mode="HTML",
reply_markup=get_main_menu_inline_keyboard(
current_lang, i18n, settings, show_trial_button_after_action
),
reply_markup=reply_markup,
disable_web_page_preview=True,
)