Merge pull request #2831 from InfinityPacer/feature/push

app/api/endpoints/webhook.py

@@ -22,7 +22,7 @@ async def webhook_message(background_tasks: BackgroundTasks,
                           _: str = Depends(verify_apitoken)
                           ) -> Any:
     """
-    Webhook响应，配置请求中需要添加参数：token=API_TOKEN&source=消息配置名
+    Webhook响应，配置请求中需要添加参数：token=API_TOKEN&source=媒体服务器名
     """
     body = await request.body()
     form = await request.form()
@@ -35,7 +35,7 @@ async def webhook_message(background_tasks: BackgroundTasks,
 def webhook_message(background_tasks: BackgroundTasks,
                     request: Request, _: str = Depends(verify_apitoken)) -> Any:
     """
-    Webhook响应，配置请求中需要添加参数：token=API_TOKEN&source=消息配置名
+    Webhook响应，配置请求中需要添加参数：token=API_TOKEN&source=媒体服务器名
     """
     args = request.query_params
     background_tasks.add_task(start_webhook_chain, None, None, args)

app/modules/emby/__init__.py

@@ -78,7 +78,10 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
             server: Emby = self.get_instance(source)
             if not server:
                 return None
-            return server.get_webhook_message(form, args)
+            result = server.get_webhook_message(form, args)
+            if result:
+                result.server_name = source
+            return result
 
         for server in self.get_instances().values():
             if server:

app/modules/jellyfin/__init__.py

@@ -78,7 +78,10 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
             server: Jellyfin = self.get_instance(source)
             if not server:
                 return None
-            return server.get_webhook_message(body)
+            result = server.get_webhook_message(body)
+            if result:
+                result.server_name = source
+            return result
 
         for server in self.get_instances().values():
             if server:

app/modules/plex/__init__.py

@@ -64,7 +64,10 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
             server: Plex = self.get_instance(source)
             if not server:
                 return None
-            return server.get_webhook_message(form)
+            result = server.get_webhook_message(form)
+            if result:
+                result.server_name = source
+            return result
 
         for server in self.get_instances().values():
             if server:

app/schemas/mediaserver.py

@@ -139,6 +139,7 @@ class WebhookEventInfo(BaseModel):
     """
     event: Optional[str] = None
     channel: Optional[str] = None
+    server_name: Optional[str] = None
     item_type: Optional[str] = None
     item_name: Optional[str] = None
     item_id: Optional[str] = None