fix 签到bug

This commit is contained in:
thsrite 2023-10-20 16:29:17 +08:00
parent 556d8586a7
commit 6eb0b4cb5b
2 changed files with 17 additions and 15 deletions

View File

@ -106,7 +106,8 @@ class AutoLogin(_PluginBase):
if self._notify: if self._notify:
self.post_message(mtype=NotificationType.SiteMessage, self.post_message(mtype=NotificationType.SiteMessage,
title=f"站点 {site_name} 自动更新Cookie和Ua{'成功' if state else '失败'}") title=f"站点 {site_name} Cookie已失效。",
text=f"自动更新Cookie和Ua{'成功' if state else '失败'}")
else: else:
logger.error(f"未获取到站点{site_name}配置,已跳过") logger.error(f"未获取到站点{site_name}配置,已跳过")

View File

@ -729,6 +729,16 @@ class AutoSignIn(_PluginBase):
site_id = None site_id = None
if site_name: if site_name:
site_id = sites.get(site_name) site_id = sites.get(site_name)
if 'Cookie已失效' in str(s) and site_id:
# 触发自动登录插件登录
autologin = self.get_config("AutoLogin")
if autologin and autologin.get("enabled") and autologin.get("siteconf"):
logger.info(f"触发站点 {site_name} 自动登录更新Cookie和Ua")
self.eventmanager.send_event(EventType.SiteLogin,
{
"site_id": site_id
})
# 记录本次命中重试关键词的站点 # 记录本次命中重试关键词的站点
if self._retry_keyword: if self._retry_keyword:
if site_id: if site_id:
@ -740,25 +750,16 @@ class AutoSignIn(_PluginBase):
retry_msg.append(s) retry_msg.append(s)
continue continue
if "登录成功" in s: if "登录成功" in str(s):
login_success_msg.append(s) login_success_msg.append(s)
elif "仿真签到成功" in s: elif "仿真签到成功" in str(s):
fz_sign_msg.append(s) fz_sign_msg.append(s)
continue continue
elif "签到成功" in s: elif "签到成功" in str(s):
sign_success_msg.append(s) sign_success_msg.append(s)
elif '已签到' in s: elif '已签到' in str(s):
already_sign_msg.append(s) already_sign_msg.append(s)
else: else:
if 'Cookie已失效' in s and site_id:
# 触发自动登录插件登录
autologin = self.get_config("AutoLogin")
if autologin and autologin.get("enabled") and autologin.get("siteconf"):
logger.info(f"触发站点 {site_name} 自动登录更新Cookie和Ua")
self.eventmanager.send_event(EventType.SiteLogin,
{
"site_id": site_id
})
failed_msg.append(s) failed_msg.append(s)
if not self._retry_keyword: if not self._retry_keyword:
@ -774,7 +775,7 @@ class AutoSignIn(_PluginBase):
}) })
# 自动Cloudflare IP优选 # 自动Cloudflare IP优选
if self._auto_cf and self._auto_cf > 0 and retry_msg and len(retry_msg) > self._auto_cf: if self._auto_cf and int(self._auto_cf) > 0 and retry_msg and len(retry_msg) >= int(self._auto_cf):
EventManager().send_event(EventType.CloudFlareSpeedTest, {}) EventManager().send_event(EventType.CloudFlareSpeedTest, {})
# 发送通知 # 发送通知