diff --git a/app/models/user.py b/app/models/user.py index 0c45e88..34d4a7f 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -7,7 +7,7 @@ from typing import List, Optional, Union from pydantic import field_validator, ConfigDict, BaseModel, Field, validator, computed_field, ValidationInfo from app.models.proxy import InboundBase -from config import XRAY_SUBSCRIPTION_PATH, XRAY_SUBSCRIPTION_URL_PREFIX +from config import XRAY_SUBSCRIPTION_URL_PREFIX USERNAME_REGEXP = re.compile(r"^(?=\w{3,32}\b)[a-zA-Z0-9-_@.]+(?:_[a-zA-Z0-9-_@.]+)*$") @@ -195,7 +195,7 @@ class UserResponse(User): def subscription_url(self) -> str: salt = secrets.token_hex(8) url_prefix = (XRAY_SUBSCRIPTION_URL_PREFIX).replace('*', salt) - return f"{url_prefix}/{XRAY_SUBSCRIPTION_PATH}/{self.username}/{self.key}" + return f"{url_prefix}/sub/{self.username}/{self.key}" class UsersResponse(BaseModel): diff --git a/config.py b/config.py index 7d5f2d3..695b9e3 100755 --- a/config.py +++ b/config.py @@ -22,15 +22,9 @@ VITE_BASE_API = f"http://127.0.0.1:{UVICORN_PORT}/api/" \ if DEBUG and config("VITE_BASE_API", default="/api/") == "/api/" \ else config("VITE_BASE_API", default="/api/") -XRAY_JSON = config("XRAY_JSON", default="./xray_config.json") XRAY_FALLBACKS_INBOUND_TAG = config("XRAY_FALLBACKS_INBOUND_TAG", cast=str, default="") or config( "XRAY_FALLBACK_INBOUND_TAG", cast=str, default="" ) -XRAY_EXECUTABLE_PATH = config("XRAY_EXECUTABLE_PATH", default="/usr/local/bin/xray") -if not os.path.isfile(XRAY_EXECUTABLE_PATH): - raise FileNotFoundError("Xray path doesn't exist.") -XRAY_ASSETS_PATH = config("XRAY_ASSETS_PATH", default="/usr/local/share/xray") -XRAY_EXCLUDE_INBOUND_TAGS = config("XRAY_EXCLUDE_INBOUND_TAGS", default='').split() XRAY_SUBSCRIPTION_URL_PREFIX = config("XRAY_SUBSCRIPTION_URL_PREFIX", default="").strip("/") TELEGRAM_API_TOKEN = config("TELEGRAM_API_TOKEN", default="") @@ -83,7 +77,4 @@ DISABLE_RECORDING_NODE_USAGE = config("DISABLE_RECORDING_NODE_USAGE", cast=bool, # headers: profile-update-interval, support-url, profile-title SUB_UPDATE_INTERVAL = config("SUB_UPDATE_INTERVAL", default="12") SUB_SUPPORT_URL = config("SUB_SUPPORT_URL", default="https://t.me/") -SUB_PROFILE_TITLE = config("SUB_PROFILE_TITLE", default="Subscription") - -# discord webhook log -DISCORD_WEBHOOK_URL = config("DISCORD_WEBHOOK_URL", default="") +SUB_PROFILE_TITLE = config("SUB_PROFILE_TITLE", default="Subscription") \ No newline at end of file