diff --git a/README.md b/README.md index 61f5f68d..28cebee6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 🚀 SoloBot **SoloBot** — ваш идеальный помощник для управления API 3x-UI VPN на протоколе VLESS. -*релиз 1.4 — полная доработка работы с ключами. + ## 📋 Оглавление 1. [Описание](#описание) diff --git a/handlers/keys/key_management.py b/handlers/keys/key_management.py index e50ff7bf..06d765a5 100644 --- a/handlers/keys/key_management.py +++ b/handlers/keys/key_management.py @@ -12,7 +12,7 @@ from aiogram.types import (CallbackQuery, InlineKeyboardButton, from auth import login_with_credentials, link_subscription from client import add_client from config import (ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, - SERVERS) + SERVERS, APP_URL) from database import add_connection, get_balance, store_key, update_balance from handlers.instructions.instructions import send_instructions from handlers.profile import process_callback_view_profile @@ -190,18 +190,24 @@ async def handle_key_name_input(message: Message, state: FSMContext): hours, remainder = divmod(remaining_time.seconds, 3600) minutes, _ = divmod(remainder, 60) - remaining_time_message = ( - f"Оставшееся время ключа: {days} день" - ) + remaining_time_message = f"Оставшееся время ключа: {days} день" + button_profile = InlineKeyboardButton(text='👤 Мой профиль', callback_data='view_profile') + button_iphone = InlineKeyboardButton( + text='🍏IPhone', + url=f'{APP_URL}/?url=v2raytun://import/{connection_link}' + ) + button_android = InlineKeyboardButton( + text='🤖Android', + url=f'{APP_URL}/?url=v2raytun://import-sub?url={connection_link}' + ) + keyboard = InlineKeyboardMarkup(inline_keyboard=[ - [InlineKeyboardButton(text='📘 Инструкции по использованию', callback_data='instructions')], - [InlineKeyboardButton(text='🔙 Перейти в профиль', callback_data='view_profile')] + [button_iphone, button_android], + [button_profile] ]) - key_message = ( - key_message_success(connection_link, remaining_time_message) - ) + key_message = key_message_success(connection_link, remaining_time_message) await message.bot.send_message(tg_id, key_message, parse_mode="HTML", reply_markup=keyboard) diff --git a/handlers/start.py b/handlers/start.py index d44bad0a..2f2e7dd9 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -79,11 +79,11 @@ async def handle_connect_vpn(callback_query: CallbackQuery): button_iphone = InlineKeyboardButton( text='🍏IPhone', - url=f'{APP_URL}/?url=streisand://import/{trial_key_info["key"]}' + url=f'{APP_URL}/?url=v2raytun://import/{trial_key_info["key"]}' ) button_android = InlineKeyboardButton( text='🤖Android', - url=f'{APP_URL}/?url=v2rayng://install-sub?url={trial_key_info["key"]}' + url=f'{APP_URL}/?url=v2raytun://import-sub?url={trial_key_info["key"]}' ) inline_keyboard = InlineKeyboardMarkup(inline_keyboard=[