Refactor trial management function names for clarity. Renamed set_trial to update_trial in database.py and updated all related handler calls in start.py, admin_user_editor.py, and trial_key.py to reflect this change. This improves code readability and consistency across the codebase.
This commit is contained in:
+3
-1
@@ -279,7 +279,7 @@ async def delete_coupon(coupon_code: str, session: Any):
|
||||
return False
|
||||
|
||||
|
||||
async def set_trial(tg_id: int, status: int, session: Any):
|
||||
async def update_trial(tg_id: int, status: int, session: Any):
|
||||
"""
|
||||
Устанавливает статус триального периода для пользователя.
|
||||
|
||||
@@ -1568,6 +1568,8 @@ async def get_all_keys(session: Any = None):
|
||||
finally:
|
||||
if conn is not None and session is None:
|
||||
await conn.close()
|
||||
|
||||
|
||||
import json
|
||||
from datetime import datetime
|
||||
from typing import Any
|
||||
|
||||
@@ -16,7 +16,7 @@ from database import (
|
||||
get_key_details,
|
||||
get_keys,
|
||||
get_servers,
|
||||
set_trial,
|
||||
update_trial,
|
||||
update_key_expiry,
|
||||
)
|
||||
from filters.admin import IsAdminFilter
|
||||
@@ -207,7 +207,7 @@ async def handle_tg_id_input(message: types.Message, state: FSMContext, session:
|
||||
async def handle_restore_trial(callback_query: types.CallbackQuery, session: Any):
|
||||
tg_id = int(callback_query.data.split("_")[2])
|
||||
|
||||
await set_trial(tg_id, 0, session)
|
||||
await update_trial(tg_id, 0, session)
|
||||
|
||||
builder = InlineKeyboardBuilder()
|
||||
builder.row(InlineKeyboardButton(text="🔙 Назад в меню администратора", callback_data="admin"))
|
||||
|
||||
@@ -8,7 +8,7 @@ from py3xui import AsyncApi
|
||||
|
||||
from client import ClientConfig, add_client
|
||||
from config import ADMIN_PASSWORD, ADMIN_USERNAME, LIMIT_IP, PUBLIC_LINK, SUPERNODE, TOTAL_GB, TRIAL_TIME
|
||||
from database import get_servers, get_trial, store_key, set_trial
|
||||
from database import get_servers, get_trial, store_key, update_trial
|
||||
from handlers.texts import INSTRUCTIONS
|
||||
from handlers.utils import generate_random_email, get_least_loaded_cluster
|
||||
from logger import logger
|
||||
@@ -83,5 +83,5 @@ async def create_trial_key(tg_id: int, session: Any):
|
||||
session=session,
|
||||
)
|
||||
|
||||
await set_trial(tg_id, 1, session)
|
||||
await update_trial(tg_id, 1, session)
|
||||
return result
|
||||
|
||||
+2
-2
@@ -31,7 +31,7 @@ from database import (
|
||||
get_coupon_details,
|
||||
get_referral_by_referred_id,
|
||||
get_trial,
|
||||
set_trial,
|
||||
update_trial,
|
||||
)
|
||||
from handlers.buttons.add_subscribe import (
|
||||
DOWNLOAD_ANDROID_BUTTON,
|
||||
@@ -212,7 +212,7 @@ async def handle_connect_vpn(callback_query: CallbackQuery, session: Any):
|
||||
if "error" in trial_key_info:
|
||||
await callback_query.message.answer(trial_key_info["error"])
|
||||
else:
|
||||
await set_trial(user_id, 1, session)
|
||||
await update_trial(user_id, 1, session)
|
||||
|
||||
key_message = (
|
||||
f"🔑 <b>Ваш персональный ключ доступа:</b>\n"
|
||||
|
||||
Reference in New Issue
Block a user