From cd5ec16c3ae10fa5e7e9e86105c2af1c2e4bd0bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=AE=E5=B8=AE?= <3102509561@qq.com> Date: Sun, 30 Jul 2023 04:07:18 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E4=B8=8D=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 帮帮 <3102509561@qq.com> --- plugins/genshin/defSet/mys/pushNews.yaml | 15 +++++++-------- plugins/genshin/model/mysNews.js | 5 +---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/plugins/genshin/defSet/mys/pushNews.yaml b/plugins/genshin/defSet/mys/pushNews.yaml index 888185a..2435a78 100644 --- a/plugins/genshin/defSet/mys/pushNews.yaml +++ b/plugins/genshin/defSet/mys/pushNews.yaml @@ -5,14 +5,13 @@ pushTime: 0 0/5 * * * ? maxNum: 1 # 包含关键字不推送 -banWord: { - gs: /冒险助力礼包|纪行|预下载|脚本外挂|集中反馈|已开奖|云·原神|魔神任务|传说任务|线下赛|晋级赛|战绩更新|海选赛|邀请赛|积分赛|战绩工具|交流平台|首日赛|线上赛|社区内容|个人专访|全民赛|决赛|总决赛|半决赛|淘汰赛|作品展示|同人|大别野/g, - sr: /预下载|脚本外挂|集中反馈|已开奖|问题说明|意见反馈|账号封禁|工具|直播预告|获奖名单|大别野/g, - wd: /大别野|已开奖/g, - bb: /已开奖|大别野/g, - bbb: /封禁名单|大别野|马克兔速报|预下载/g, - zzz: /作品展示|已开奖|大别野/g -} +banWord: + gs: 冒险助力礼包|纪行|预下载|脚本外挂|集中反馈|已开奖|云·原神|魔神任务|传说任务|线下赛|晋级赛|战绩更新|海选赛|邀请赛|积分赛|战绩工具|交流平台|首日赛|线上赛|社区内容|个人专访|全民赛|决赛|总决赛|半决赛|淘汰赛|作品展示|同人|大别野 + sr: 预下载|脚本外挂|集中反馈|已开奖|问题说明|意见反馈|账号封禁|工具|直播预告|获奖名单|大别野 + wd: 大别野|已开奖 + bb: 已开奖|大别野 + bbb: 封禁名单|大别野|马克兔速报|预下载 + zzz: 作品展示|已开奖|大别野 #原神公告推送群 gsannounceGroup: {} diff --git a/plugins/genshin/model/mysNews.js b/plugins/genshin/model/mysNews.js index 0ad6715..1d3665f 100644 --- a/plugins/genshin/model/mysNews.js +++ b/plugins/genshin/model/mysNews.js @@ -277,9 +277,6 @@ export default class MysNews extends base { for (let gid of [1, 2, 3, 4, 6, 8]) { let type = gid == 1 ? 'bbb' : gid == 2 ? 'gs' : gid == 3 ? 'bb' : gid == 4 ? 'wd' : gid == 6 ? 'sr' : 'zzz' - // 包含关键字不推送 - let banWord = cfg.banWord[type] - let news = [] if (!lodash.isEmpty(cfg[`${type}announceGroup`])) { let anno = await this.postData('getNewsList', { gids: gid, page_size: 10, type: 1 }) @@ -303,7 +300,7 @@ export default class MysNews extends base { if (Number(now - val.post.created_at) > interval) { continue } - if (new RegExp(banWord).test(val.post.subject)) { + if (cfg.banWord[type] && new RegExp(cfg.banWord[type]).test(val.post.subject)) { continue } if (val.typeName == '公告') {