diff --git a/app/routes/subscription.py b/app/routes/subscription.py index 0353b05..6c59454 100644 --- a/app/routes/subscription.py +++ b/app/routes/subscription.py @@ -14,8 +14,7 @@ from config import ( SUB_PROFILE_TITLE, SUB_SUPPORT_URL, SUB_UPDATE_INTERVAL, - SUBSCRIPTION_PAGE_TEMPLATE, - XRAY_SUBSCRIPTION_PATH + SUBSCRIPTION_PAGE_TEMPLATE ) router = APIRouter(tags=['Subscription']) @@ -30,8 +29,8 @@ def get_subscription_user_info(user: UserResponse) -> dict: } -@router.get("/%s/{username}/{key}/" % XRAY_SUBSCRIPTION_PATH) -@router.get("/%s/{username}/{key}" % XRAY_SUBSCRIPTION_PATH, include_in_schema=False) +@router.get("/sub/{username}/{key}/") +@router.get("/sub/{username}/{key}", include_in_schema=False) def user_subscription(db_user: SubUserDep, request: Request, db: DBDep, @@ -92,12 +91,12 @@ def user_subscription(db_user: SubUserDep, return Response(content=conf, media_type="text/plain", headers=response_headers) -@router.get("/%s/{username}/{key}/info" % XRAY_SUBSCRIPTION_PATH, response_model=UserResponse) +@router.get("/sub/{username}/{key}/info", response_model=UserResponse) def user_subscription_info(db_user: SubUserDep): return db_user -@router.get("/%s/{username}/{key}/usage" % XRAY_SUBSCRIPTION_PATH) +@router.get("/sub/{username}/{key}/usage") def user_get_usage(db_user: SubUserDep, db: DBDep, start: str = None, @@ -118,7 +117,7 @@ def user_get_usage(db_user: SubUserDep, return {"usages": usages, "username": db_user.username} -@router.get("/%s/{username}/{key}/{client_type}" % XRAY_SUBSCRIPTION_PATH) +@router.get("/sub/{username}/{key}/{client_type}") def user_subscription_with_client_type( db_user: SubUserDep, request: Request, diff --git a/config.py b/config.py index 4afe0b8..7d5f2d3 100755 --- a/config.py +++ b/config.py @@ -32,7 +32,6 @@ if not os.path.isfile(XRAY_EXECUTABLE_PATH): 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("/") -XRAY_SUBSCRIPTION_PATH = config("XRAY_SUBSCRIPTION_PATH", default="sub").strip("/") TELEGRAM_API_TOKEN = config("TELEGRAM_API_TOKEN", default="") TELEGRAM_ADMIN_ID = config(