fix messages

app/schemas/__init__.py

@@ -14,4 +14,4 @@ from .message import *
 from .tmdb import *
 from .transfer import *
 from .filetransfer import *
-from .mediaserver import *
+from .system import *

app/schemas/mediaserver.py

@@ -156,15 +156,3 @@ class MediaServerPlayItem(BaseModel):
     image: Optional[str] = None
     link: Optional[str] = None
     percent: Optional[float] = None
-
-
-class MediaServerConf(BaseModel):
-    """
-    媒体服务器配置
-    """
-    # 名称
-    name: Optional[str] = None
-    # 类型 emby/jellyfin/plex
-    type: Optional[str] = None
-    # 配置
-    config: Optional[dict] = {}

app/schemas/message.py

@@ -15,6 +15,8 @@ class CommingMessage(BaseModel):
     username: Optional[str] = None
     # 消息渠道
     channel: Optional[MessageChannel] = None
+    # 来源（渠道名称）
+    source: Optional[str] = None
     # 消息体
     text: Optional[str] = None
     # 时间
@@ -39,6 +41,8 @@ class Notification(BaseModel):
     """
     # 消息渠道
     channel: Optional[MessageChannel] = None
+    # 消息来源
+    source: Optional[str] = None
     # 消息类型
     mtype: Optional[NotificationType] = None
     # 标题

app/schemas/system.py

@@ -13,6 +13,8 @@ class MediaServerConf(BaseModel):
     type: Optional[str] = None
     # 配置
     config: Optional[dict] = {}
+    # 是否启用
+    enabled: Optional[bool] = False
 
 
 class DownloaderConf(BaseModel):
@@ -27,3 +29,21 @@ class DownloaderConf(BaseModel):
     default: Optional[bool] = False
     # 配置
     config: Optional[dict] = {}
+    # 是否启用
+    enabled: Optional[bool] = False
+
+
+class NotificationConf(BaseModel):
+    """
+    通知配置
+    """
+    # 名称
+    name: Optional[str] = None
+    # 类型 telegram/wechat/vocechat/synologychat
+    type: Optional[str] = None
+    # 配置
+    config: Optional[dict] = {}
+    # 场景开关
+    switchs: Optional[list] = []
+    # 是否启用
+    enabled: Optional[bool] = False