diff --git a/app/keyboards/inline.py b/app/keyboards/inline.py index 32cdd2f0..6e1a0980 100644 --- a/app/keyboards/inline.py +++ b/app/keyboards/inline.py @@ -1,4 +1,5 @@ from typing import List, Optional +from aiogram import types from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton from app.config import settings, PERIOD_PRICES, TRAFFIC_PRICES @@ -107,15 +108,34 @@ def get_subscription_keyboard( connect_mode = settings.CONNECT_BUTTON_MODE if connect_mode == "miniapp_subscription": - button_text = "πŸš€ ΠžΡ‚ΠΊΡ€Ρ‹Ρ‚ΡŒ Π² ΠΌΠΈΠ½ΠΈ-ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠΈ" + keyboard.append([ + InlineKeyboardButton( + text="πŸš€ ΠžΡ‚ΠΊΡ€Ρ‹Ρ‚ΡŒ Π² ΠΌΠΈΠ½ΠΈ-ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠΈ", + web_app=types.WebAppInfo(url=subscription.subscription_url) + ) + ]) + keyboard.append([ + InlineKeyboardButton(text="πŸ“‹ ΠŸΠΎΠΊΠ°Π·Π°Ρ‚ΡŒ ссылку", callback_data="open_subscription_link") + ]) elif connect_mode == "miniapp_custom": - button_text = "πŸš€ ΠžΡ‚ΠΊΡ€Ρ‹Ρ‚ΡŒ ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅" + if settings.MINIAPP_CUSTOM_URL: + keyboard.append([ + InlineKeyboardButton( + text="πŸš€ ΠžΡ‚ΠΊΡ€Ρ‹Ρ‚ΡŒ ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅", + web_app=types.WebAppInfo(url=settings.MINIAPP_CUSTOM_URL) + ) + ]) + keyboard.append([ + InlineKeyboardButton(text="πŸ“‹ ΠŸΠΎΠΊΠ°Π·Π°Ρ‚ΡŒ ссылку подписки", callback_data="open_subscription_link") + ]) + else: + keyboard.append([ + InlineKeyboardButton(text="πŸ”— ΠŸΠΎΠ΄ΠΊΠ»ΡŽΡ‡ΠΈΡ‚ΡŒΡΡ", callback_data="subscription_connect") + ]) else: - button_text = "πŸ”— ΠŸΠΎΠ΄ΠΊΠ»ΡŽΡ‡ΠΈΡ‚ΡŒΡΡ" - - keyboard.append([ - InlineKeyboardButton(text=button_text, callback_data="subscription_connect") - ]) + keyboard.append([ + InlineKeyboardButton(text="πŸ”— ΠŸΠΎΠ΄ΠΊΠ»ΡŽΡ‡ΠΈΡ‚ΡŒΡΡ", callback_data="subscription_connect") + ]) if not is_trial and subscription and subscription.days_left <= 3: keyboard.append([