diff --git a/app/plugins/autosignin/__init__.py b/app/plugins/autosignin/__init__.py index 945a23fe..1933705d 100644 --- a/app/plugins/autosignin/__init__.py +++ b/app/plugins/autosignin/__init__.py @@ -96,7 +96,7 @@ class AutoSignIn(_PluginBase): if status: logger.info("站点签到任务完成!") # 发送通知 - self.chain.run_module("post_message", title="站点自动签到", text="\n".join(status)) + self.chain.post_message(title="站点自动签到", text="\n".join(status)) else: logger.error("站点签到任务失败!") @@ -118,7 +118,7 @@ class AutoSignIn(_PluginBase): try: status, msg = site_module().signin(site_info) # 特殊站点直接返回签到信息,防止仿真签到、模拟登陆有歧义 - return msg + return msg or "" except Exception as e: return f"【{site_info.get('name')}】签到失败:{str(e)}" else: diff --git a/app/plugins/sitestatistic/__init__.py b/app/plugins/sitestatistic/__init__.py index 885f078f..af9d9e53 100644 --- a/app/plugins/sitestatistic/__init__.py +++ b/app/plugins/sitestatistic/__init__.py @@ -128,10 +128,10 @@ class SiteStatistic(_PluginBase): i = html_text.find("window.location") if i == -1: return None - tmp_url = url + html_text[i:html_text.find(";")]\ - .replace("\"", "")\ - .replace("+", "")\ - .replace(" ", "")\ + tmp_url = url + html_text[i:html_text.find(";")] \ + .replace("\"", "") \ + .replace("+", "") \ + .replace(" ", "") \ .replace("window.location=", "") res = RequestUtils(cookies=site_cookie, session=session, @@ -244,11 +244,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.run_module("post_message", title=msg_title, text=msg_text) + self.chain.post_message(title=msg_title, text=msg_text) else: - self.chain.run_module("post_message", - title=f"站点 {site_user_info.site_name} 收到 " - f"{site_user_info.message_unread} 条新消息,请登陆查看") + self.chain.post_message(title=f"站点 {site_user_info.site_name} 收到 " + f"{site_user_info.message_unread} 条新消息,请登陆查看") @eventmanager.register(EventType.SiteStatistic) def refresh(self, event: Event): @@ -330,6 +329,6 @@ class SiteStatistic(_PluginBase): f"总上传:{StringUtils.str_filesize(incUploads)}\n" f"总下载:{StringUtils.str_filesize(incDownloads)}\n" f"————————————") - self.chain.run_module("post_message", title="站点数据统计", text="\n".join(messages)) + self.chain.post_message(title="站点数据统计", text="\n".join(messages)) logger.info("站点数据刷新完成")