From 99313e35123a83ae0f6c385b9e6ece2f03169b35 Mon Sep 17 00:00:00 2001 From: Vasiliynemix Date: Wed, 15 Jul 2026 09:19:37 +0200 Subject: [PATCH 1/2] init for prod --- .idea/.gitignore | 3 + .idea/inspectionProfiles/Project_Default.xml | 156 ++++++++++++++++++ .../inspectionProfiles/profiles_settings.xml | 6 + .idea/misc.xml | 4 + .idea/modules.xml | 8 + .idea/remawave.iml | 17 ++ .idea/vcs.xml | 6 + remnawave/models/hwid.py | 4 +- 8 files changed, 202 insertions(+), 2 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/remawave.iml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..df47c7b --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,156 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..825639b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..be0e57a --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/remawave.iml b/.idea/remawave.iml new file mode 100644 index 0000000..857ff94 --- /dev/null +++ b/.idea/remawave.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/remnawave/models/hwid.py b/remnawave/models/hwid.py index 8ff3ee1..14392e6 100644 --- a/remnawave/models/hwid.py +++ b/remnawave/models/hwid.py @@ -22,8 +22,8 @@ class DeleteUserHwidDeviceRequestDto(BaseModel): class HwidDeviceDto(BaseModel): hwid: str - user_uuid: UUID = Field(alias="userUuid") - platform: Optional[str] = None + user_uuid: Optional[UUID] = Field(default=None, alias="userUuid") # Ваша версия кидает ошибку на новом API 2.8.0 + user_id: Optional[int] = Field(default=None, alias="userId") # Добавил для исключения ошибок указанных снизу os_version: Optional[str] = Field(None, alias="osVersion") device_model: Optional[str] = Field(None, alias="deviceModel") user_agent: Optional[str] = Field(None, alias="userAgent") From 411e926af301e9cd1df1033e0868fdd879400687 Mon Sep 17 00:00:00 2001 From: Vasiliynemix Date: Wed, 15 Jul 2026 09:37:47 +0200 Subject: [PATCH 2/2] add platform to HwidDeviceDto --- .idea/misc.xml | 3 +++ remnawave/models/hwid.py | 1 + 2 files changed, 4 insertions(+) diff --git a/.idea/misc.xml b/.idea/misc.xml index 825639b..2c99b9c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ + + \ No newline at end of file diff --git a/remnawave/models/hwid.py b/remnawave/models/hwid.py index 14392e6..34d8dd4 100644 --- a/remnawave/models/hwid.py +++ b/remnawave/models/hwid.py @@ -24,6 +24,7 @@ class HwidDeviceDto(BaseModel): hwid: str user_uuid: Optional[UUID] = Field(default=None, alias="userUuid") # Ваша версия кидает ошибку на новом API 2.8.0 user_id: Optional[int] = Field(default=None, alias="userId") # Добавил для исключения ошибок указанных снизу + platform: Optional[str] = None os_version: Optional[str] = Field(None, alias="osVersion") device_model: Optional[str] = Field(None, alias="deviceModel") user_agent: Optional[str] = Field(None, alias="userAgent")