From 495d98c2b252ea314a03fd7a384f3c8bfac877bd Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 19 May 2024 09:52:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#2086=20=E6=B2=A1=E6=9C=89=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E6=97=B6=E8=AE=A2=E9=98=85=E6=89=93=E4=B8=8D=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20&&=20=E9=BB=98=E8=AE=A4=E6=B4=97?=
 =?UTF-8?q?=E7=89=88=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/endpoints/subscribe.py | 4 +++-
 app/chain/subscribe.py         | 2 +-
 app/schemas/subscribe.py       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/api/endpoints/subscribe.py b/app/api/endpoints/subscribe.py
index eec64844..08d780b4 100644
--- a/app/api/endpoints/subscribe.py
+++ b/app/api/endpoints/subscribe.py
@@ -42,7 +42,9 @@ def read_subscribes(
     subscribes = Subscribe.list(db)
     for subscribe in subscribes:
         if subscribe.sites:
-            subscribe.sites = json.loads(subscribe.sites)
+            subscribe.sites = json.loads(str(subscribe.sites))
+        else:
+            subscribe.sites = []
     return subscribes
 
 
diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py
index 735ac339..ea5490a4 100644
--- a/app/chain/subscribe.py
+++ b/app/chain/subscribe.py
@@ -141,7 +141,7 @@ class SubscribeChain(ChainBase):
             'effect': self.__get_default_subscribe_config(mediainfo.type, "effect"),
             'include': self.__get_default_subscribe_config(mediainfo.type, "include"),
             'exclude': self.__get_default_subscribe_config(mediainfo.type, "exclude"),
-            'best_version': self.__get_default_subscribe_config(mediainfo.type, "best_version") if kwargs.get("best_version") is None else kwargs.get("best_version"),
+            'best_version': self.__get_default_subscribe_config(mediainfo.type, "best_version") if not kwargs.get("best_version") else kwargs.get("best_version"),
             'search_imdbid': self.__get_default_subscribe_config(mediainfo.type, "search_imdbid"),
             'sites': self.__get_default_subscribe_config(mediainfo.type, "sites") or None,
             'save_path': self.__get_default_subscribe_config(mediainfo.type, "save_path"),
diff --git a/app/schemas/subscribe.py b/app/schemas/subscribe.py
index ac2a592f..7569244d 100644
--- a/app/schemas/subscribe.py
+++ b/app/schemas/subscribe.py
@@ -53,7 +53,7 @@ class Subscribe(BaseModel):
     # 订阅用户
     username: Optional[str] = None
     # 订阅站点
-    sites: Optional[List[int]] = None
+    sites: Optional[List[int]] = []
     # 是否洗版
     best_version: Optional[int] = 0
     # 当前优先级