fix: удалить поле add_username_to_base_subscription из моделей подписки и обновить соответствующие классы

This commit is contained in:
Artem 2025-11-26 22:21:50 +01:00
parent 442e5844a4
commit 18776967b4
No known key found for this signature in database
GPG key ID: 833485276B7902CE
4 changed files with 7 additions and 6 deletions

View file

@ -190,6 +190,7 @@ from .subscription import (
SubscriptionInfoResponseDto, # Legacy alias
UserSubscription,
GetRawSubscriptionByShortUuidResponseDto,
RawSettings,
GetSubscriptionByShortUUIDResponseDto,
GetSubscriptionByUUIDResponseDto,
)
@ -429,6 +430,7 @@ __all__ = [
"SubscriptionInfoResponseDto", # Legacy alias
"UserSubscription",
"GetRawSubscriptionByShortUuidResponseDto",
"RawSettings",
# Subscription settings models
"GetSubscriptionSettingsResponseDto",
"SubscriptionSettingsResponseDto",

View file

@ -34,7 +34,6 @@ class ExternalSquadSubscriptionSettingsDto(BaseModel):
profile_update_interval: int = Field(alias="profileUpdateInterval", ge=1)
is_profile_webpage_url_enabled: bool = Field(alias="isProfileWebpageUrlEnabled")
serve_json_at_base_subscription: bool = Field(alias="serveJsonAtBaseSubscription")
add_username_to_base_subscription: bool = Field(alias="addUsernameToBaseSubscription")
is_show_custom_remarks: bool = Field(alias="isShowCustomRemarks")
happ_announce: Optional[str] = Field(None, alias="happAnnounce")
happ_routing: Optional[str] = Field(None, alias="happRouting")

View file

@ -123,6 +123,10 @@ class RawHostDbData(BaseModel):
tag: Optional[str] = None
vless_route_id: Optional[int] = Field(None, alias="vlessRouteId")
class RawSettings(BaseModel):
"""Raw settings for network configuration"""
header_type: Optional[str] = Field(None, alias="headerType")
request: Optional[Dict[str, Any]] = None
class RawHost(BaseModel):
password: Passwords
@ -140,7 +144,7 @@ class RawHost(BaseModel):
sni: Optional[str] = None
spider_x: Optional[str] = Field(None, alias="spiderX")
tls: Optional[str] = None
header_type: Optional[str] = Field(None, alias="headerType")
raw_settings: Optional[RawSettings] = Field(None, alias="rawSettings")
additional_params: Optional[RawHostAdditionalParams] = Field(None, alias="additionalParams")
x_http_extra_params: Optional[Dict[str, Any]] = Field(None, alias="xHttpExtraParams")
mux_params: Optional[Dict[str, Any]] = Field(None, alias="muxParams")

View file

@ -80,7 +80,6 @@ class SubscriptionSettingsResponseDto(BaseModel):
profile_update_interval: int = Field(alias="profileUpdateInterval", ge=1)
is_profile_webpage_url_enabled: bool = Field(alias="isProfileWebpageUrlEnabled")
serve_json_at_base_subscription: bool = Field(alias="serveJsonAtBaseSubscription")
add_username_to_base_subscription: bool = Field(alias="addUsernameToBaseSubscription")
show_custom_remarks: bool = Field(alias="isShowCustomRemarks")
custom_remarks: CustomRemarks = Field(alias="customRemarks")
@ -117,9 +116,6 @@ class UpdateSubscriptionSettingsRequestDto(BaseModel):
serve_json_at_base_subscription: Optional[bool] = Field(
None, serialization_alias="serveJsonAtBaseSubscription"
)
add_username_to_base_subscription: Optional[bool] = Field(
None, serialization_alias="addUsernameToBaseSubscription"
)
is_show_custom_remarks: Optional[bool] = Field(None, serialization_alias="isShowCustomRemarks")
custom_remarks: Optional[CustomRemarks] = Field(None, serialization_alias="customRemarks")