From a6457a7f1e4571e8e9b72afe520fa01450b4e82a Mon Sep 17 00:00:00 2001 From: Licardo Date: Wed, 23 Jul 2025 18:37:54 +0800 Subject: [PATCH 1/3] optimize code --- plugins.v2/meowmsg/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins.v2/meowmsg/__init__.py b/plugins.v2/meowmsg/__init__.py index 10e8db5..15fa10d 100644 --- a/plugins.v2/meowmsg/__init__.py +++ b/plugins.v2/meowmsg/__init__.py @@ -1,4 +1,4 @@ -from typing import Any, List, Dict, Tuple, Optional +from typing import Any, List, Dict, Tuple from urllib.parse import parse_qs from app.core.event import eventmanager, Event @@ -48,7 +48,7 @@ class MeoWMsg(_PluginBase): 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]]: @@ -183,7 +183,7 @@ class MeoWMsg(_PluginBase): def get_page(self) -> List[dict]: pass - def _send(self, title: str, text: str) -> Optional[Tuple[bool, str]]: + def _send(self, title: str, text: str): """ 发送消息 :param title: 标题 @@ -193,11 +193,11 @@ 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消息发送成功") else: From 7e06d8c4c4b133604a52644d2bdb150a20004a32 Mon Sep 17 00:00:00 2001 From: Licardo Date: Thu, 24 Jul 2025 20:10:12 +0800 Subject: [PATCH 2/3] optimize code --- package.v2.json | 5 +++-- plugins.v2/meowmsg/__init__.py | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/package.v2.json b/package.v2.json index 85b6f07..c34b9f5 100644 --- a/package.v2.json +++ b/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": "优化代码，修复运行一次按钮没办法自动关闭的问题" } } } diff --git a/plugins.v2/meowmsg/__init__.py b/plugins.v2/meowmsg/__init__.py index 15fa10d..129601f 100644 --- a/plugins.v2/meowmsg/__init__.py +++ b/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" # 作者主页 @@ -39,12 +38,20 @@ class MeoWMsg(_PluginBase): if config: self._enabled = config.get("enabled") self._onlyonce = config.get("onlyonce") - self._msgtypes = config.get("msgtypes") or [] + self._msgtypes = config.get("msgtypes") self._server = config.get("server") 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: @@ -199,7 +206,7 @@ class MeoWMsg(_PluginBase): 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): From 5ac0fd2d835e243036519b7827828f3f9da38835 Mon Sep 17 00:00:00 2001 From: Licardo Date: Thu, 24 Jul 2025 20:26:37 +0800 Subject: [PATCH 3/3] optimize code --- plugins.v2/meowmsg/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins.v2/meowmsg/__init__.py b/plugins.v2/meowmsg/__init__.py index 129601f..145cded 100644 --- a/plugins.v2/meowmsg/__init__.py +++ b/plugins.v2/meowmsg/__init__.py @@ -1,4 +1,4 @@ -from typing import Any, List, Dict, Tuple +from typing import Any, List, Dict, Tuple, Optional from urllib.parse import parse_qs from app.core.event import eventmanager, Event @@ -38,7 +38,7 @@ class MeoWMsg(_PluginBase): if config: self._enabled = config.get("enabled") self._onlyonce = config.get("onlyonce") - self._msgtypes = config.get("msgtypes") + self._msgtypes = config.get("msgtypes") or [] self._server = config.get("server") self._nickname = config.get("nickname") @@ -190,7 +190,7 @@ class MeoWMsg(_PluginBase): def get_page(self) -> List[dict]: pass - def _send(self, title: str, text: str): + def _send(self, title: str, text: str) -> Optional[Tuple[bool, str]]: """ 发送消息 :param title: 标题