From 9791431da232431f2823b508e1a15db5e0759977 Mon Sep 17 00:00:00 2001 From: catboss <12584668+catbos@user.noreply.gitee.com> Date: Thu, 16 Nov 2023 16:45:36 +0000 Subject: [PATCH 01/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0icqq=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=A6=81=E8=A8=80=E7=AD=89=E9=97=AE=E9=A2=98=E5=8F=8A?= =?UTF-8?q?=E6=94=AF=E6=8C=818.9.90=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: catboss <12584668+catbos@user.noreply.gitee.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 31775b1..c3c454d 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "chalk": "^5.3.0", "chokidar": "^3.5.3", "https-proxy-agent": "7.0.2", - "icqq": "^0.6.2", + "icqq": "^0.6.3", "image-size": "^1.0.2", "inquirer": "^9.2.12", "lodash": "^4.17.21", From 5f16e8fcac7548aedfa57060edc105f5cca792a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=83=E5=A5=88=E5=8D=83=E7=A5=81?= Date: Thu, 16 Nov 2023 17:31:55 +0000 Subject: [PATCH 02/12] =?UTF-8?q?!124=20=E6=B7=BB=E5=8A=A0`=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF=E9=94=99=E8=AF=AF=E6=97=B6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E4=B8=BB=E4=BA=BA`=E5=BC=80=E5=85=B3=20*=20=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E9=81=87=E5=88=B046=E7=BE=A4=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E6=9C=AA=E5=8F=8A=E6=97=B6=E5=A4=84=E7=90=86~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/default_config/bot.yaml | 2 ++ lib/plugins/loader.js | 1 + 2 files changed, 3 insertions(+) diff --git a/config/default_config/bot.yaml b/config/default_config/bot.yaml index afb9399..8dc3d92 100644 --- a/config/default_config/bot.yaml +++ b/config/default_config/bot.yaml @@ -5,6 +5,8 @@ log_level: info ignore_self: true # 被风控时是否尝试用分片发送 resend: false +# 发送消息错误时是否通知主人 +sendmsg_error: false # ffmpeg ffmpeg_path: ffprobe_path: diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js index e97484e..67c953d 100644 --- a/lib/plugins/loader.js +++ b/lib/plugins/loader.js @@ -537,6 +537,7 @@ class PluginsLoader { } logger.error(`发送消息错误:${msg}`) logger.error(err) + if(cfg.bot.sendmsg_error) Bot[Bot.uin].pickUser(cfg.masterQQ[0]).sendMsg(`发送消息错误:${msg}`) } // 频道一下是不是频道 From db00e7c582445844582bf680b40c73296b3e13c0 Mon Sep 17 00:00:00 2001 From: Willis <569869783@qq.com> Date: Thu, 16 Nov 2023 17:32:19 +0000 Subject: [PATCH 03/12] !125 update docker/Dockerfile. * update docker/Dockerfile. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f9e2712..71f9087 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,7 +49,7 @@ RUN export BUNDLE_FFMPEG=${BUNDLE_FFMPEG:-true} \ \ && _NPM_MIRROR_FLAG="" \ && if [ "$USE_NPM_MIRROR"x = "true"x ]; then _NPM_MIRROR_FLAG="--registry=https://registry.npmmirror.com"; fi \ - && npm install pnpm@7.30.0 -g $_NPM_MIRROR_FLAG \ + && npm install pnpm -g $_NPM_MIRROR_FLAG \ \ && ((test "$BUNDLE_POETRY"x = "true"x \ && apt-get update \ From 0adcb79973678ce544e122bd228e01a4b97a9d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E5=8F=B6?= Date: Fri, 17 Nov 2023 11:49:56 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E9=93=811.5?= =?UTF-8?q?=E4=B8=8A=E5=8D=8A=E5=8D=A1=E6=B1=A0=20(#319)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/defSet/pool/11.yaml | 11 ++++++++++- plugins/genshin/defSet/pool/12.yaml | 11 ++++++++++- plugins/genshin/model/base.js | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/plugins/genshin/defSet/pool/11.yaml b/plugins/genshin/defSet/pool/11.yaml index 9b31bef..7fa6ecf 100644 --- a/plugins/genshin/defSet/pool/11.yaml +++ b/plugins/genshin/defSet/pool/11.yaml @@ -1,3 +1,12 @@ +- from: '2023-11-15 06:00:00' + to: '2023-12-06 11:59:59' + five: + - 藿藿 + four: + - 丹恒 + - 阿兰 + - 希露瓦 + name: 令奉贞凶 - from: '2023-10-27 12:00:00' to: '2023-11-14 14:59:59' five: @@ -88,4 +97,4 @@ - 娜塔莎 - 虎克 - 佩拉 - name: 蝶立锋锷 \ No newline at end of file + name: 蝶立锋锷 diff --git a/plugins/genshin/defSet/pool/12.yaml b/plugins/genshin/defSet/pool/12.yaml index 0d6ae7c..fe4baa4 100644 --- a/plugins/genshin/defSet/pool/12.yaml +++ b/plugins/genshin/defSet/pool/12.yaml @@ -1,3 +1,12 @@ +- from: '2023-11-15 06:00:00' + to: '2023-12-06 11:59:59' + five: + - 惊魂夜 + four: + - 同一种心情 + - 点个关注吧！ + - 宇宙市场趋势 + name: 流光定影 - from: '2023-10-27 12:00:00' to: '2023-11-14 14:59:59' five: @@ -88,4 +97,4 @@ - 一场术后对话 - 晚安与睡颜 - 鼹鼠党欢迎你 - name: 流光定影 \ No newline at end of file + name: 流光定影 diff --git a/plugins/genshin/model/base.js b/plugins/genshin/model/base.js index 3ae2a1e..4bec8a3 100644 --- a/plugins/genshin/model/base.js +++ b/plugins/genshin/model/base.js @@ -39,7 +39,7 @@ export default class base { defaultLayout: layoutPath + 'default.html' } if (this.e?.isSr) { - let char = Character.get('银狼', 'sr') + let char = Character.get('藿藿', 'sr') return { ...data, tplFile: `./plugins/genshin/resources/StarRail/html/${this.model}/${this.model}.html`, From 50bc28d2e64d195be2ecf4f810beda7296c5f958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=82=B3=E5=A5=BD?= Date: Sat, 18 Nov 2023 13:55:31 +0000 Subject: [PATCH 05/12] =?UTF-8?q?=E9=80=82=E9=85=8DQQ=E9=A2=91=E9=81=93?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA/=E6=8C=87=E4=BB=A4=20![=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=9B=BE=E7=89=87=E8=AF=B4=E6=98=8E](https://foruda.g?= =?UTF-8?q?itee.com/images/1700315712258375101/f63963c9=5F7403553.png=20"?= =?UTF-8?q?=E5=B1=8F=E5=B9=95=E6=88=AA=E5=9B=BE")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈炳好 --- lib/plugins/loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js index 67c953d..9f9837b 100644 --- a/lib/plugins/loader.js +++ b/lib/plugins/loader.js @@ -392,7 +392,7 @@ class PluginsLoader { for (let val of e.message) { switch (val.type) { case 'text': - e.msg = (e.msg || '') + (val.text || '').replace(/^\s*[＃井#]+\s*/, '#').replace(/^\s*[\\*※＊]+\s*/, '*').trim() + e.msg = (e.msg || '') + (val.text || '').replace(/^\s*[＃井#\/]+\s*/, '#').replace(/^\s*[\\*※＊]+\s*/, '*').trim() break case 'image': if (!e.img) { From b9f2b7f9088bca240f49e4f92cbf619dca6e9ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=A3=9E?= <42599406+xfdown@users.noreply.github.com> Date: Thu, 23 Nov 2023 01:35:18 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F=E5=90=8E=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E8=BF=98=E4=BC=9A=E5=88=B7=E6=96=B0=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98=E3=80=82=20(#321)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/events/login.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/events/login.js b/lib/events/login.js index ce3d9b7..db93a63 100644 --- a/lib/events/login.js +++ b/lib/events/login.js @@ -31,6 +31,7 @@ export default class loginEvent extends EventListener { time++ let res = await this.client.queryQrcodeResult() if (res.retcode === 0) { + inSlider = true console.log('\n') logger.info(logger.green('扫码成功，开始登录...')) console.log('\n') From bf9244c3285e21807ff63ac476fe5b1261c2aaea Mon Sep 17 00:00:00 2001 From: batvbs Date: Wed, 22 Nov 2023 17:36:58 +0000 Subject: [PATCH 07/12] =?UTF-8?q?!128=20=E4=BF=AE=E5=A4=8D=20`#=E7=BB=91?= =?UTF-8?q?=E5=AE=9AUID=20123456789`=20=E6=97=A0=E5=93=8D=E5=BA=94=20*=20u?= =?UTF-8?q?pdate=20plugins/genshin/apps/user.js.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/apps/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/genshin/apps/user.js b/plugins/genshin/apps/user.js index d572008..0a25d86 100644 --- a/plugins/genshin/apps/user.js +++ b/plugins/genshin/apps/user.js @@ -42,7 +42,7 @@ export class user extends plugin { fnc: 'delUid' }, { - reg: '^#(原神|星铁)?绑定(uid|UID)?[1-9][0-9]{8}$', + reg: '^#(原神|星铁)?绑定(uid|UID)? ?[1-9][0-9]{8}$', fnc: 'bingUid' }, { From ee32c2235f99adb94ab966af309ea4f4ba43fec6 Mon Sep 17 00:00:00 2001 From: Kokomi <1379177109@qq.com> Date: Thu, 23 Nov 2023 13:09:59 +0800 Subject: [PATCH 08/12] revert pr!129 --- lib/plugins/loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js index 9f9837b..67c953d 100644 --- a/lib/plugins/loader.js +++ b/lib/plugins/loader.js @@ -392,7 +392,7 @@ class PluginsLoader { for (let val of e.message) { switch (val.type) { case 'text': - e.msg = (e.msg || '') + (val.text || '').replace(/^\s*[＃井#\/]+\s*/, '#').replace(/^\s*[\\*※＊]+\s*/, '*').trim() + e.msg = (e.msg || '') + (val.text || '').replace(/^\s*[＃井#]+\s*/, '#').replace(/^\s*[\\*※＊]+\s*/, '*').trim() break case 'image': if (!e.img) { From c655de822cdda73dcd16a665ea237c85b2d0b619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ca=28HCO=E2=82=83=29=E2=82=82?= <143723419+kaguramaisakuya@users.noreply.github.com> Date: Thu, 23 Nov 2023 20:10:09 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=B1=B3=E6=B8=B8?= =?UTF-8?q?=E7=A4=BE=E7=B2=BE=E8=87=B4=E5=AE=9D=E7=AE=B1=20(#322)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/apps/user.js | 4 ++-- plugins/genshin/defSet/role/index.yaml | 4 ++-- plugins/genshin/defSet/role/name.yaml | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/genshin/apps/user.js b/plugins/genshin/apps/user.js index 0a25d86..f264e27 100644 --- a/plugins/genshin/apps/user.js +++ b/plugins/genshin/apps/user.js @@ -38,11 +38,11 @@ export class user extends plugin { fnc: 'delCk' }, { - reg: '^#?(原神|星铁)?(删除|解绑)uid\\s*[0-9]{1,2}$', + reg: '^#?(原神|星铁)?(删除|解绑)(uid|UID)?\\s*[0-9]{1,2}$', fnc: 'delUid' }, { - reg: '^#(原神|星铁)?绑定(uid|UID)? ?[1-9][0-9]{8}$', + reg: '^#(原神|星铁)?绑定(uid|UID)?\\s*[1-9][0-9]{8}$', fnc: 'bingUid' }, { diff --git a/plugins/genshin/defSet/role/index.yaml b/plugins/genshin/defSet/role/index.yaml index b4fd9f4..2f4de92 100644 --- a/plugins/genshin/defSet/role/index.yaml +++ b/plugins/genshin/defSet/role/index.yaml @@ -8,7 +8,7 @@ avatar: 75 level: 60 # 总宝箱 -all_chest: 6038 +all_chest: 6044 # 奇馈宝箱 magic_chest: 221 @@ -20,7 +20,7 @@ luxurious_chest: 242 precious_chest: 632 # 精致宝箱 -exquisite_chest: 2076 +exquisite_chest: 2082 # 普通宝箱 common_chest: 2867 diff --git a/plugins/genshin/defSet/role/name.yaml b/plugins/genshin/defSet/role/name.yaml index 6fe663e..493cede 100644 --- a/plugins/genshin/defSet/role/name.yaml +++ b/plugins/genshin/defSet/role/name.yaml @@ -886,6 +886,7 @@ - 海獭 - 水獭 - 龙王 + - 那位来客 10000088: - 夏洛蒂 - Charlotte @@ -898,6 +899,7 @@ - 鸟记者 - 狗仔队 - 跑得快 + - 战地记者 10000089: - 芙宁娜 - Furina @@ -906,8 +908,11 @@ - 水神 - 芙宁娜女士 - 大明星 + - 演员 - 芙芙 - 傻芙芙 - 罪人 - 假水神 - 水的女儿 + - 白芙 + - 黑芙 From 6431f8d96f18f7523aee7825e32815a27e610b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ca=28HCO=E2=82=83=29=E2=82=82?= <143723419+kaguramaisakuya@users.noreply.github.com> Date: Thu, 23 Nov 2023 23:46:33 +0800 Subject: [PATCH 10/12] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=9F=90?= =?UTF-8?q?=E4=BA=9B=E8=A1=A8=E6=83=85=E5=90=8E=E6=97=A0=E6=B3=95=E5=88=A0?= =?UTF-8?q?=E9=99=A4=20(#323)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/apps/user.js | 2 +- plugins/system/add.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/genshin/apps/user.js b/plugins/genshin/apps/user.js index f264e27..f8b2ba7 100644 --- a/plugins/genshin/apps/user.js +++ b/plugins/genshin/apps/user.js @@ -38,7 +38,7 @@ export class user extends plugin { fnc: 'delCk' }, { - reg: '^#?(原神|星铁)?(删除|解绑)(uid|UID)?\\s*[0-9]{1,2}$', + reg: '^#?(原神|星铁)?(删除|解绑)(uid|UID)\\s*[0-9]{1,2}$', fnc: 'delUid' }, { diff --git a/plugins/system/add.js b/plugins/system/add.js index 268b454..5bfec4a 100644 --- a/plugins/system/add.js +++ b/plugins/system/add.js @@ -87,6 +87,10 @@ export class add extends plugin { this.e.reply('添加错误：没有关键词') return } + if (/uid/i.test(this.keyWord)) { + this.e.reply('请勿添加特殊关键词') + return + } this.setContext('addContext') From ca5d3ebebf1163ded85a9e162596519bdcdce9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E5=8F=B6?= Date: Tue, 28 Nov 2023 03:08:22 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=9F=E7=A5=9E4.2?= =?UTF-8?q?=E4=B8=8B=E5=8D=8A=E5=8D=A1=E6=B1=A0=20(#324)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 更新原神4.2下半卡池 * 更新原神4.2下半卡池 * 更新原神4.2下半卡池 * Update base.js --- plugins/genshin/defSet/gacha/pool.yaml | 18 ++++++++++++++++++ plugins/genshin/defSet/pool/301.yaml | 10 ++++++++++ plugins/genshin/defSet/pool/302.yaml | 13 +++++++++++++ plugins/genshin/model/base.js | 2 +- 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/plugins/genshin/defSet/gacha/pool.yaml b/plugins/genshin/defSet/gacha/pool.yaml index 4cd9af9..b802a21 100644 --- a/plugins/genshin/defSet/gacha/pool.yaml +++ b/plugins/genshin/defSet/gacha/pool.yaml @@ -1,3 +1,21 @@ +- up4: + - 绮良良 + - 久岐忍 + - 香菱 + up5: + - 赛诺 + up5_2: + - 神里绫人 + weapon5: + - 赤沙之杖 + - 波乱月白经津 + weapon4: + - 匣里龙吟 + - 西风大剑 + - 西风长枪 + - 流浪乐章 + - 西风猎弓 + endTime: "2023-12-19 14:59:59" - up4: - 夏洛蒂 - 柯莱 diff --git a/plugins/genshin/defSet/pool/301.yaml b/plugins/genshin/defSet/pool/301.yaml index e76e720..a5c9e72 100644 --- a/plugins/genshin/defSet/pool/301.yaml +++ b/plugins/genshin/defSet/pool/301.yaml @@ -1,3 +1,13 @@ +- from: '2023-11-28 18:00:00' + to: '2023-12-19 14:59:59' + five: + - 赛诺 + - 神里绫人 + four: + - 绮良良 + - 久岐忍 + - 香菱 + name: 雳裁冥昭|苍流踏花 - from: '2023-11-08 06:00:00' to: '2023-11-28 17:59:59' five: diff --git a/plugins/genshin/defSet/pool/302.yaml b/plugins/genshin/defSet/pool/302.yaml index 03ce257..9870509 100644 --- a/plugins/genshin/defSet/pool/302.yaml +++ b/plugins/genshin/defSet/pool/302.yaml @@ -1,3 +1,15 @@ +- from: '2023-11-28 18:00:00' + to: '2023-12-19 14:59:59' + five: + - 赤沙之杖 + - 波乱月白经津 + four: + - 匣里龙吟 + - 西风大剑 + - 西风长枪 + - 流浪乐章 + - 西风猎弓 + name: 神铸赋形 - from: '2023-11-08 06:00:00' to: '2023-11-28 17:59:59' five: @@ -9,6 +21,7 @@ - 匣里灭辰 - 祭礼残章 - 绝弦 + name: 神铸赋形 - from: '2023-10-17 18:00:00' to: '2023-11-07 14:59:59' five: diff --git a/plugins/genshin/model/base.js b/plugins/genshin/model/base.js index 4bec8a3..ca87bd9 100644 --- a/plugins/genshin/model/base.js +++ b/plugins/genshin/model/base.js @@ -50,7 +50,7 @@ export default class base { game: 'sr', } } - let char = Character.get('芙宁娜', 'gs') + let char = Character.get('赛诺', 'gs') return { ...data, tplFile: `./plugins/genshin/resources/html/${this.model}/${this.model}.html`, From 27737dfe0d9ad2b7e926f13671b018ca4ec6aa28 Mon Sep 17 00:00:00 2001 From: Zyy955 <74231782+Zyy955@users.noreply.github.com> Date: Tue, 28 Nov 2023 03:09:05 +0800 Subject: [PATCH 12/12] =?UTF-8?q?fix=EF=BC=9A=E5=A4=9Abot=E4=B8=8B`e.bot`?= =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4ICQQ=20(#326)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/common.js | 10 +++------- lib/plugins/loader.js | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/common/common.js b/lib/common/common.js index f0e500e..57c5e29 100644 --- a/lib/common/common.js +++ b/lib/common/common.js @@ -80,9 +80,7 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) { try { let info = await e.bot.getGroupMemberInfo(e.group_id, id) name = info.card || info.nickname - } catch (err) { - logger.error(err) - } + } catch (err) { } } let userInfo = { @@ -125,10 +123,8 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) { .replace(/___+/, `${dec}`) } } - } catch (err) { - logger.error(err) - } - + } catch (err) { } + return forwardMsg } diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js index 67c953d..ded7ed4 100644 --- a/lib/plugins/loader.js +++ b/lib/plugins/loader.js @@ -177,7 +177,7 @@ class PluginsLoader { */ async deal (e) { Object.defineProperty(e, 'bot', { - value: Bot + value: Bot[e?.self_id || Bot.uin] }) /** 检查频道消息 */ if (this.checkGuildMsg(e)) return