Merge pull request #860 from L1cardo/main

package.v2.json

@@ -498,12 +498,13 @@
     "name": "MeoW消息通知",
     "description": "支持使用MeoW发送消息通知。",
     "labels": "消息通知",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "icon": "MeoW_A.png",
     "author": "Licardo",
     "level": 2,
     "history": {
-      "v1.0.0": "首个版本，新增MeoW消息通知"
+      "v1.0.0": "首个版本，新增MeoW消息通知",
+      "v1.0.1": "优化代码，修复运行一次按钮没办法自动关闭的问题"
     }
   }
 }

plugins.v2/meowmsg/__init__.py

@@ -7,7 +7,6 @@ from app.plugins import _PluginBase
 from app.schemas.types import EventType, NotificationType
 from app.utils.http import RequestUtils
 
-
 class MeoWMsg(_PluginBase):
     # 插件名称
     plugin_name = "MeoW消息通知"
@@ -16,7 +15,7 @@ class MeoWMsg(_PluginBase):
     # 插件图标
     plugin_icon = "MeoW_A.png"
     # 插件版本
-    plugin_version = "1.0.0"
+    plugin_version = "1.0.1"
     # 插件作者
     plugin_author = "Licardo"
     # 作者主页
@@ -44,11 +43,19 @@ class MeoWMsg(_PluginBase):
             self._nickname = config.get("nickname")
 
         if self._onlyonce:
+            logger.info(f"测试插件，立即运行一次")
             self._onlyonce = False
+            self.update_config({
+                "enabled": self._enabled,
+                "onlyonce": self._onlyonce,
+                "msgtypes": self._msgtypes,
+                "server": self._server,
+                "nickname": self._nickname
+            })
             self._send("MeoW消息测试通知", "MeoW消息通知插件已启用")
 
     def get_state(self) -> bool:
-        return self._enabled and (True if self._server and self._nickname else False)
+        return self._enabled and (self._server is not None and self._nickname is not None)
 
     @staticmethod
     def get_command() -> List[Dict[str, Any]]:
@@ -193,13 +200,13 @@ class MeoWMsg(_PluginBase):
             if not self._server or not self._nickname:
                 return False, "参数未配置"
             req_body = {"title": title, "msg": text}
-            res = RequestUtils().post_res(f"{self._server}/{self._nickname}", data=req_body)
+            res = RequestUtils().post_res(f"{self._server.rstrip('/')}/{self._nickname}", data=req_body)
             if res and res.status_code == 200:
-                ret_json = res.json()
-                code = ret_json["code"]
-                message = ret_json["message"]
+                res_json = res.json()
+                code = res_json.get("status")
+                message = res_json.get("msg")
                 if code == 200:
-                    logger.info(f"{self._nickname} MeoW消息发送成功")
+                    logger.info(f"{self._nickname} MeoW消息发送成功，消息内容：{title} - {text}")
                 else:
                     logger.warn(f"{self._nickname} MeoW消息发送失败：{message}")
             elif res is not None:
@@ -208,8 +215,8 @@ class MeoWMsg(_PluginBase):
                 )
             else:
                 logger.warn(f"{self._nickname} MeoW消息发送失败：未获取到返回信息")
-        except Exception as msg_e:
-            logger.error(f"MeoW消息发送失败：{str(msg_e)}")
+        except Exception as e:
+            logger.error(f"MeoW消息发送失败：{str(e)}")
 
     @eventmanager.register(EventType.NoticeMessage)
     def send(self, event: Event):