Merge remote-tracking branch 'origin/main'

package.json

@@ -167,12 +167,13 @@
     "name": "群辉Webhook通知",
     "description": "接收群辉webhook通知并推送。",
     "labels": "消息通知",
-    "version": "1.2",
+    "version": "1.3",
     "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/synology.png",
     "author": "thsrite",
     "level": 1,
     "v2": true,
     "history": {
+      "v1.3": "新增参数title、content、url",
       "v1.2": "修改配置描述",
       "v1.1": "修复bug",
       "v1.0": "接收群辉webhook通知并推送"
@@ -820,5 +821,27 @@
       "v1.3": "调整插件开启状态判断条件",
       "v1.2": "增强API安全性"
     }
+  },
+  "WeatherWidget": {
+    "name": "天气",
+    "description": "定时推送天气，并在仪表盘中显示实时天气。",
+    "labels": "工具,仪表板",
+    "version": "1.8.1",
+    "icon": "https://raw.githubusercontent.com/InfinityPacer/MoviePilot-Plugins/main/icons/weatherwidget.png",
+    "author": "InfinityPacer",
+    "level": 1,
+    "v2": true,
+    "history": {
+      "v1.8.1": "修复消息推送（I神摆烂了）",
+      "v1.8": "增加自动高度及组件规格，部分显示效果需要主程序升级1.9.3+版本及后续优化",
+      "v1.7": "天气时间以及空气质量调整为原生渲染，优化显示效果",
+      "v1.6": "增加天气定时推送以及对应的Bot指令",
+      "v1.5": "优化了天气显示效果，可以根据日出和日落时间自动切换不同的主题背景，并可根据设备选择不同的适配模式",
+      "v1.4": "优化不同天气下的背景显示效果",
+      "v1.3": "优化无边框显示效果，支持切换显示边框，进一步优化性能",
+      "v1.2": "精准匹配城市，并支持无边框显示，需要主程序升级v1.8.8+版本",
+      "v1.1": "性能优化以及天气图片显示优化",
+      "v1.0": "增加天气插件，支持在仪表盘中显示实时天气小部件"
+    }
   }
 }

package.v2.json

@@ -350,11 +350,12 @@
     "name": "订阅规则自动填充",
     "description": "电视剧下载后自动添加官组等信息到订阅；添加订阅后根据二级分类名称自定义订阅规则。",
     "labels": "订阅",
-    "version": "2.8.6",
+    "version": "2.8.7",
     "icon": "teamwork.png",
     "author": "thsrite",
     "level": 2,
     "history": {
+      "v2.8.7": "修复下载填充",
       "v2.8.6": "修复订阅填充",
       "v2.8.4": "修复订阅分辨率",
       "v2.8.3": "规则填充忽略大小写",

plugins.v2/subscribegroup/__init__.py

@@ -20,7 +20,7 @@ class SubscribeGroup(_PluginBase):
     # 插件图标
     plugin_icon = "teamwork.png"
     # 插件版本
-    plugin_version = "2.8.6"
+    plugin_version = "2.8.7"
     # 插件作者
     plugin_author = "thsrite"
     # 作者主页
@@ -329,7 +329,7 @@ class SubscribeGroup(_PluginBase):
                         update_dict['include'] = resource_team
                 # 站点
                 if "站点" in self._update_details and (
-                        not subscribe.sites or (subscribe.sites and len(json.loads(subscribe.sites)) == 0)):
+                        not subscribe.sites or (subscribe.sites and len(subscribe.sites) == 0)):
                     # 站点 判断是否在订阅站点范围内
                     rss_sites = self.systemconfig.get(SystemConfigKey.RssSites) or []
                     if _torrent and _torrent.site and int(_torrent.site) in rss_sites:

plugins/synologynotify/__init__.py

@@ -13,7 +13,7 @@ class SynologyNotify(_PluginBase):
     # 插件图标
     plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/synology.png"
     # 插件版本
-    plugin_version = "1.2"
+    plugin_version = "1.3"
     # 插件作者
     plugin_author = "thsrite"
     # 作者主页
@@ -36,18 +36,23 @@ class SynologyNotify(_PluginBase):
             self._notify = config.get("notify")
             self._msgtype = config.get("msgtype")
 
-    def send_notify(self, text: str) -> schemas.Response:
+    def send_notify(self, text: str = None, title: str = None, content: str = None, url: str = None) -> schemas.Response:
         """
         发送通知
         """
-        logger.info(f"收到webhook消息啦。。。  {text}")
+        logger.info(f"收到webhook消息啦。。。  {text}  {title} {content} {url}")
         if self._enabled and self._notify:
             mtype = NotificationType.Manual
             if self._msgtype:
                 mtype = NotificationType.__getitem__(str(self._msgtype)) or NotificationType.Manual
-            self.post_message(title="群辉通知",
-                              mtype=mtype,
-                              text=text)
+            if text:
+                self.post_message(title="群辉通知",
+                                  mtype=mtype,
+                                  text=text)
+            else:
+                self.post_message(title=title,
+                                  mtype=mtype,
+                                  text=f"{content}\n[查看详情]({url})")
 
         return schemas.Response(
             success=True,
@@ -71,13 +76,15 @@ class SynologyNotify(_PluginBase):
             "summary": "API说明"
         }]
         """
-        return [{
-            "path": "/webhook",
-            "endpoint": self.send_notify,
-            "methods": ["GET"],
-            "summary": "群辉webhook",
-            "description": "接受群辉webhook通知并推送",
-        }]
+        return [
+            {
+                "path": "/webhook",
+                "endpoint": self.send_notify,
+                "methods": ["GET"],
+                "summary": "群辉webhook",
+                "description": "接受群辉webhook通知并推送",
+            }
+        ]
 
     def get_form(self) -> Tuple[List[dict], Dict[str, Any]]:
         """