fix happ cryptolink for remnawave webapp
This commit is contained in:
@@ -28,6 +28,7 @@ from config import (
|
|||||||
RENEW_BUTTON_BEFORE_DAYS,
|
RENEW_BUTTON_BEFORE_DAYS,
|
||||||
TOGGLE_CLIENT,
|
TOGGLE_CLIENT,
|
||||||
USE_COUNTRY_SELECTION,
|
USE_COUNTRY_SELECTION,
|
||||||
|
HAPP_CRYPTOLINK
|
||||||
)
|
)
|
||||||
from database import get_key_details, get_keys, get_servers, get_tariff_by_id
|
from database import get_key_details, get_keys, get_servers, get_tariff_by_id
|
||||||
from database.models import Key
|
from database.models import Key
|
||||||
@@ -320,7 +321,7 @@ async def render_key_info(message: Message, session: Any, key_name: str, image_p
|
|||||||
if ENABLE_UPDATE_SUBSCRIPTION_BUTTON:
|
if ENABLE_UPDATE_SUBSCRIPTION_BUTTON:
|
||||||
builder.row(InlineKeyboardButton(text=RENEW_SUB, callback_data=f"update_subscription|{key_name}"))
|
builder.row(InlineKeyboardButton(text=RENEW_SUB, callback_data=f"update_subscription|{key_name}"))
|
||||||
|
|
||||||
if is_full_remnawave and final_link and REMNAWAVE_WEBAPP:
|
if is_full_remnawave and final_link and REMNAWAVE_WEBAPP and not HAPP_CRYPTOLINK:
|
||||||
if vless_enabled:
|
if vless_enabled:
|
||||||
builder.row(InlineKeyboardButton(text=ROUTER_BUTTON, callback_data=f"connect_router|{key_name}"))
|
builder.row(InlineKeyboardButton(text=ROUTER_BUTTON, callback_data=f"connect_router|{key_name}"))
|
||||||
else:
|
else:
|
||||||
|
|||||||
+2
-4
@@ -141,10 +141,8 @@ async def process_start_logic(
|
|||||||
if not await check_user_exists(session, user_data["tg_id"]):
|
if not await check_user_exists(session, user_data["tg_id"]):
|
||||||
await add_user(session=session, **user_data)
|
await add_user(session=session, **user_data)
|
||||||
|
|
||||||
trial_status, key_count = await asyncio.gather(
|
trial_status = await get_trial(session, user_data["tg_id"])
|
||||||
get_trial(session, user_data["tg_id"]),
|
key_count = await get_key_count(session, user_data["tg_id"])
|
||||||
get_key_count(session, user_data["tg_id"]),
|
|
||||||
)
|
|
||||||
|
|
||||||
if SHOW_START_MENU_ONCE:
|
if SHOW_START_MENU_ONCE:
|
||||||
if key_count > 0 or trial_status == 1:
|
if key_count > 0 or trial_status == 1:
|
||||||
|
|||||||
Reference in New Issue
Block a user