refactor(subscription): streamline user_subscription_raw parameters and improve readability

Author: M03ED

app/operation/subscription.py

@@ -6,20 +6,20 @@
 from fastapi.responses import HTMLResponse
 
 from app.db import AsyncSession
-from app.db.crud.user import get_user_usages, user_sub_update
 from app.db.crud.hwid import (
     get_user_hwid_by_value,
     get_user_hwid_count,
     register_user_hwid,
     update_hwid_last_used,
 )
+from app.db.crud.user import get_user_usages, user_sub_update
 from app.db.models import User
 from app.models.admin import AdminDetails
-from app.models.settings import Application, ConfigFormat, SubRule, Subscription as SubSettings, HWIDSettings
+from app.models.settings import Application, ConfigFormat, HWIDSettings, SubRule, Subscription as SubSettings
 from app.models.stats import UserUsageStatsList
 from app.models.subscription import SubscriptionUsageQuery
 from app.models.user import SubscriptionUserResponse, UsersResponseWithInbounds
-from app.settings import subscription_settings, hwid_settings
+from app.settings import hwid_settings, subscription_settings
 from app.subscription.share import encode_title, generate_subscription, setup_format_variables
 from app.templates import render_template
 from config import template_settings, wireguard_settings
@@ -496,29 +496,11 @@ def _build_raw_subscription_payload(
             "headers": headers,
         }
 
-    async def user_subscription_raw(
-        self,
-        db: AsyncSession,
-        token: str,
-        request_url: str = "",
-        update_user_agent: str = "",
-        ip: str | None = None,
-        x_hwid: str | None = None,
-        x_device_os: str | None = None,
-        x_ver_os: str | None = None,
-        x_device_model: str | None = None,
-    ):
+    async def user_subscription_raw(self, db: AsyncSession, token: str, request_url: str = ""):
         sub_settings: SubSettings = await subscription_settings()
         db_user = await self.get_validated_sub(db, token)
         user = await self.validated_user(db_user)
 
-        await self.validate_and_register_hwid(
-            db, db_user.id, db_user.hwid_limit, x_hwid, x_device_os, x_ver_os, x_device_model
-        )
-
-        if update_user_agent:
-            await user_sub_update(db, db_user.id, update_user_agent, ip=ip, hwid=x_hwid)
-
         links = []
         if sub_settings.allow_browser_config:
             conf, _ = await self.fetch_config(user, ConfigFormat.links)

app/routers/subscription.py

@@ -46,21 +46,8 @@ async def user_subscription_info(request: Request, token: str, db: AsyncSession
 
 
 @router.get("/{token}/raw")
-async def user_subscription_raw(
-    request: Request,
-    token: str,
-    db: AsyncSession = Depends(get_db),
-    update_user_agent: str = Header(default="", alias="X-Subscription-User-Agent"),
-    headers=Depends(get_subscription_headers),
-):
-    return await subscription_operator.user_subscription_raw(
-        db,
-        token=token,
-        request_url=str(request.url),
-        update_user_agent=update_user_agent,
-        ip=request.client.host if request.client else None,
-        **headers.model_dump(),
-    )
+async def user_subscription_raw(request: Request, token: str, db: AsyncSession = Depends(get_db)):
+    return await subscription_operator.user_subscription_raw(db, token=token, request_url=str(request.url))
 
 
 @router.get("/{token}/apps", response_model=list[Application])

app/utils/wireguard.py

@@ -180,9 +180,7 @@ def prepare_wireguard_proxy_settings_with_allocator(
             if allocator.is_reserved(peer_ip):
                 raise ValueError(f"peer IP '{peer_ip}' is reserved")
             if allocator.conflicts(peer_ip):
-                raise ValueError(
-                    f"peer IP/network '{peer_ip}' is already in use by an existing user's peer network"
-                )
+                raise ValueError(f"peer IP/network '{peer_ip}' is already in use by an existing user's peer network")
             allocator.reserve(peer_ip)
         proxy_settings.wireguard.peer_ips = peer_ips
         return proxy_settings