From 849465b2e1cf0ea4253fb5221684aeab319fa110 Mon Sep 17 00:00:00 2001 From: Egor Date: Mon, 29 Sep 2025 13:16:38 +0300 Subject: [PATCH] Revert "Hide subscription link when configured" --- app/handlers/subscription.py | 62 +++++++++++------------------------- 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/app/handlers/subscription.py b/app/handlers/subscription.py index c9278624..6bf9353d 100644 --- a/app/handlers/subscription.py +++ b/app/handlers/subscription.py @@ -894,8 +894,6 @@ async def activate_trial( subscription_link = get_display_subscription_link(subscription) if remnawave_user and subscription_link: - hide_subscription_link = settings.HIDE_SUBSCRIPTION_LINK - if settings.is_happ_cryptolink_mode(): trial_success_text = ( f"{texts.TRIAL_ACTIVATED}\n\n" @@ -910,28 +908,17 @@ async def activate_trial( ) ) else: - instruction_prompt = texts.t( - 'SUBSCRIPTION_IMPORT_INSTRUCTION_PROMPT', - 'πŸ“± НаТмитС ΠΊΠ½ΠΎΠΏΠΊΡƒ Π½ΠΈΠΆΠ΅, Ρ‡Ρ‚ΠΎΠ±Ρ‹ ΠΏΠΎΠ»ΡƒΡ‡ΠΈΡ‚ΡŒ ΠΈΠ½ΡΡ‚Ρ€ΡƒΠΊΡ†ΠΈΡŽ ΠΏΠΎ настройкС VPN Π½Π° вашСм устройствС' + subscription_import_link = texts.t( + "SUBSCRIPTION_IMPORT_LINK_SECTION", + "πŸ”— Π’Π°ΡˆΠ° ссылка для ΠΈΠΌΠΏΠΎΡ€Ρ‚Π° Π² VPN ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:\n{subscription_url}", + ).format(subscription_url=subscription_link) + + trial_success_text = ( + f"{texts.TRIAL_ACTIVATED}\n\n" + f"{subscription_import_link}\n\n" + f"{texts.t('SUBSCRIPTION_IMPORT_INSTRUCTION_PROMPT', 'πŸ“± НаТмитС ΠΊΠ½ΠΎΠΏΠΊΡƒ Π½ΠΈΠΆΠ΅, Ρ‡Ρ‚ΠΎΠ±Ρ‹ ΠΏΠΎΠ»ΡƒΡ‡ΠΈΡ‚ΡŒ ΠΈΠ½ΡΡ‚Ρ€ΡƒΠΊΡ†ΠΈΡŽ ΠΏΠΎ настройкС VPN Π½Π° вашСм устройствС')}" ) - if hide_subscription_link: - trial_success_text = ( - f"{texts.TRIAL_ACTIVATED}\n\n" - f"{instruction_prompt}" - ) - else: - subscription_import_link = texts.t( - "SUBSCRIPTION_IMPORT_LINK_SECTION", - "πŸ”— Π’Π°ΡˆΠ° ссылка для ΠΈΠΌΠΏΠΎΡ€Ρ‚Π° Π² VPN ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:\n{subscription_url}", - ).format(subscription_url=subscription_link) - - trial_success_text = ( - f"{texts.TRIAL_ACTIVATED}\n\n" - f"{subscription_import_link}\n\n" - f"{instruction_prompt}" - ) - connect_mode = settings.CONNECT_BUTTON_MODE if connect_mode == "miniapp_subscription": @@ -3525,8 +3512,6 @@ async def confirm_purchase( subscription_link = get_display_subscription_link(subscription) if remnawave_user and subscription_link: - hide_subscription_link = settings.HIDE_SUBSCRIPTION_LINK - if settings.is_happ_cryptolink_mode(): success_text = ( f"{texts.SUBSCRIPTION_PURCHASED}\n\n" @@ -3541,28 +3526,17 @@ async def confirm_purchase( ) ) else: - instruction_prompt = texts.t( - 'SUBSCRIPTION_IMPORT_INSTRUCTION_PROMPT', - 'πŸ“± НаТмитС ΠΊΠ½ΠΎΠΏΠΊΡƒ Π½ΠΈΠΆΠ΅, Ρ‡Ρ‚ΠΎΠ±Ρ‹ ΠΏΠΎΠ»ΡƒΡ‡ΠΈΡ‚ΡŒ ΠΈΠ½ΡΡ‚Ρ€ΡƒΠΊΡ†ΠΈΡŽ ΠΏΠΎ настройкС VPN Π½Π° вашСм устройствС' + import_link_section = texts.t( + "SUBSCRIPTION_IMPORT_LINK_SECTION", + "πŸ”— Π’Π°ΡˆΠ° ссылка для ΠΈΠΌΠΏΠΎΡ€Ρ‚Π° Π² VPN ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:\\n{subscription_url}", + ).format(subscription_url=subscription_link) + + success_text = ( + f"{texts.SUBSCRIPTION_PURCHASED}\n\n" + f"{import_link_section}\n\n" + f"{texts.t('SUBSCRIPTION_IMPORT_INSTRUCTION_PROMPT', 'πŸ“± НаТмитС ΠΊΠ½ΠΎΠΏΠΊΡƒ Π½ΠΈΠΆΠ΅, Ρ‡Ρ‚ΠΎΠ±Ρ‹ ΠΏΠΎΠ»ΡƒΡ‡ΠΈΡ‚ΡŒ ΠΈΠ½ΡΡ‚Ρ€ΡƒΠΊΡ†ΠΈΡŽ ΠΏΠΎ настройкС VPN Π½Π° вашСм устройствС')}" ) - if hide_subscription_link: - success_text = ( - f"{texts.SUBSCRIPTION_PURCHASED}\n\n" - f"{instruction_prompt}" - ) - else: - import_link_section = texts.t( - "SUBSCRIPTION_IMPORT_LINK_SECTION", - "πŸ”— Π’Π°ΡˆΠ° ссылка для ΠΈΠΌΠΏΠΎΡ€Ρ‚Π° Π² VPN ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:\n{subscription_url}", - ).format(subscription_url=subscription_link) - - success_text = ( - f"{texts.SUBSCRIPTION_PURCHASED}\n\n" - f"{import_link_section}\n\n" - f"{instruction_prompt}" - ) - connect_mode = settings.CONNECT_BUTTON_MODE if connect_mode == "miniapp_subscription":