From 95df7b0797e3a1cb6ff23e231431d3a70eb474a8 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 21 Jul 2023 17:05:18 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=8F=92=E4=BB=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/plugins/autosignin/__init__.py | 5 +++-- app/plugins/sitestatistic/__init__.py | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/plugins/autosignin/__init__.py b/app/plugins/autosignin/__init__.py index b96675d0..4c0df896 100644 --- a/app/plugins/autosignin/__init__.py +++ b/app/plugins/autosignin/__init__.py @@ -18,6 +18,7 @@ from app.helper.module import ModuleHelper from app.helper.sites import SitesHelper from app.log import logger from app.plugins import _PluginBase +from app.schemas import Notification from app.utils.http import RequestUtils from app.utils.site import SiteUtils from app.utils.string import StringUtils @@ -142,8 +143,8 @@ class AutoSignIn(_PluginBase): "status": s[1] } for s in status]) # 发送通知 - self.chain.post_message(title="站点自动签到", - text="\n".join([f'【{s[0]}】{s[1]}' for s in status if s])) + self.chain.post_message(Notification(title="站点自动签到", + text="\n".join([f'【{s[0]}】{s[1]}' for s in status if s]))) else: logger.error("站点签到任务失败！") diff --git a/app/plugins/sitestatistic/__init__.py b/app/plugins/sitestatistic/__init__.py index 3093bb14..af9ec0b2 100644 --- a/app/plugins/sitestatistic/__init__.py +++ b/app/plugins/sitestatistic/__init__.py @@ -17,6 +17,7 @@ from app.helper.sites import SitesHelper from app.log import logger from app.plugins import _PluginBase from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo +from app.schemas import Notification from app.utils.http import RequestUtils from app.utils.string import StringUtils from app.utils.timer import TimerUtils @@ -31,7 +32,6 @@ lock = Lock() class SiteStatistic(_PluginBase): - # 插件名称 plugin_name = "站点数据统计" # 插件描述 @@ -309,10 +309,10 @@ class SiteStatistic(_PluginBase): for head, date, content in site_user_info.message_unread_contents: msg_title = f"【站点 {site_user_info.site_name} 消息】" msg_text = f"时间：{date}\n标题：{head}\n内容：\n{content}" - self.chain.post_message(title=msg_title, text=msg_text) + self.chain.post_message(Notification(title=msg_title, text=msg_text)) else: - self.chain.post_message(title=f"站点 {site_user_info.site_name} 收到 " - f"{site_user_info.message_unread} 条新消息，请登陆查看") + self.chain.post_message(Notification(title=f"站点 {site_user_info.site_name} 收到 " + f"{site_user_info.message_unread} 条新消息，请登陆查看")) @eventmanager.register(EventType.SiteStatistic) def refresh(self, event: Event): @@ -394,6 +394,6 @@ class SiteStatistic(_PluginBase): f"总上传：{StringUtils.str_filesize(incUploads)}\n" f"总下载：{StringUtils.str_filesize(incDownloads)}\n" f"————————————") - self.chain.post_message(title="站点数据统计", text="\n".join(messages)) + self.chain.post_message(Notification(title="站点数据统计", text="\n".join(messages))) logger.info("站点数据刷新完成")