From 16de30ca6a99917c4e87e18e8dc3033c07990d51 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Wed, 26 Apr 2023 00:12:13 +0000 Subject: [PATCH 01/12] =?UTF-8?q?puppeteer=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 218b917..8634963 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "node-xlsx": "^0.21.2", "oicq": "^2.3.1", "pm2": "^5.3.0", - "puppeteer": "^19.11.0", + "puppeteer": "^19.11.1", "redis": "^4.6.5", "sequelize": "^6.31.0", "sqlite3": "^5.1.6", From e9287ae24bded8489faac6f8af8c8f4091c692da Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Thu, 27 Apr 2023 12:10:20 +0000 Subject: [PATCH 02/12] =?UTF-8?q?chromium=20--headless=3Dnew=E6=96=B0?= =?UTF-8?q?=E6=97=A0=E5=A4=B4=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- renderers/puppeteer/config_default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderers/puppeteer/config_default.yaml b/renderers/puppeteer/config_default.yaml index a8ec551..f141dfb 100644 --- a/renderers/puppeteer/config_default.yaml +++ b/renderers/puppeteer/config_default.yaml @@ -10,7 +10,7 @@ chromiumPath: puppeteerWS: # headless -headless: true +headless: new # puppeteer启动args，注意args的--前缀 args: From 8f7e19e71a11bf4ea0898ed9afea55b673c6f8ff Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Thu, 27 Apr 2023 23:32:20 +0000 Subject: [PATCH 03/12] update renderers/puppeteer/config_default.yaml. Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- renderers/puppeteer/config_default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderers/puppeteer/config_default.yaml b/renderers/puppeteer/config_default.yaml index f141dfb..57addae 100644 --- a/renderers/puppeteer/config_default.yaml +++ b/renderers/puppeteer/config_default.yaml @@ -10,7 +10,7 @@ chromiumPath: puppeteerWS: # headless -headless: new +headless: 'new' # puppeteer启动args，注意args的--前缀 args: From 6f246f7d7d8c5a7c2a6c7f7cd381fce2dc8217b6 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Thu, 27 Apr 2023 23:34:19 +0000 Subject: [PATCH 04/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=EF=BC=88=E6=9B=B4=E6=96=B0=E5=90=8E?= =?UTF-8?q?=E9=9C=80=E8=A6=81pnpm=20install=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8634963..ca7deda 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "oicq": "^2.3.1", "pm2": "^5.3.0", "puppeteer": "^19.11.1", - "redis": "^4.6.5", + "redis": "^4.6.6", "sequelize": "^6.31.0", "sqlite3": "^5.1.6", "yaml": "^2.2.2" From 98bab66b2e036a6c0fac07724a17ce9d4f923dbd Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Mon, 1 May 2023 09:50:02 +0000 Subject: [PATCH 05/12] update package.json. Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca7deda..c9ce7b9 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "pm2": "^5.3.0", "puppeteer": "^19.11.1", "redis": "^4.6.6", - "sequelize": "^6.31.0", + "sequelize": "^6.31.1", "sqlite3": "^5.1.6", "yaml": "^2.2.2" }, From 6905989828eeff0d8539b15f7ea89b8f7acabebd Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Tue, 2 May 2023 12:56:27 +0000 Subject: [PATCH 06/12] =?UTF-8?q?3.6=E4=B8=8B=E5=8D=8A=E5=8D=A1=E6=B1=A0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- plugins/genshin/defSet/gacha/pool.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/plugins/genshin/defSet/gacha/pool.yaml b/plugins/genshin/defSet/gacha/pool.yaml index 4e9229d..c5c87b8 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-05-22 18:00:00" - up4: - 久岐忍 - 多莉 From c4a11bf2a7f6fd6474260bd6d1a9b449ef947e33 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Sat, 6 May 2023 10:09:14 +0000 Subject: [PATCH 07/12] update package.json. Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c9ce7b9..7120f6d 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "chalk": "^5.2.0", "chokidar": "^3.5.3", "https-proxy-agent": "5.0.1", - "icqq": "^0.3.1", + "icqq": "^0.3.2", "image-size": "^1.0.2", "inquirer": "^8.2.5", "lodash": "^4.17.21", @@ -40,7 +40,7 @@ "yaml": "^2.2.2" }, "devDependencies": { - "eslint": "^8.39.0", + "eslint": "^8.40.0", "eslint-config-standard": "^17.0.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-n": "^15.7.0", From f81db8fce19f40afa5c006ae707dd2a49f3eacc4 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Sat, 6 May 2023 10:16:39 +0000 Subject: [PATCH 08/12] add config/default_config/notice.yaml. Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- config/default_config/notice.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 config/default_config/notice.yaml diff --git a/ config/default_config/notice.yaml b/ config/default_config/notice.yaml new file mode 100644 index 0000000..0db3a25 --- /dev/null +++ b/ config/default_config/notice.yaml @@ -0,0 +1,5 @@ +# IYUU(https://iyuu.cn/) +iyuu: + +# Server酱(https://sct.ftqq.com/) +sct: \ No newline at end of file From cb15b69571fae049cfe83b0f0e3979c54a581708 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Sat, 6 May 2023 10:17:04 +0000 Subject: [PATCH 09/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?=20config/default=5Fconfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/default_config/notice.yaml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 config/default_config/notice.yaml diff --git a/ config/default_config/notice.yaml b/ config/default_config/notice.yaml deleted file mode 100644 index 0db3a25..0000000 --- a/ config/default_config/notice.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# IYUU(https://iyuu.cn/) -iyuu: - -# Server酱(https://sct.ftqq.com/) -sct: \ No newline at end of file From 4aa77a90dd778a78cdb6078b84ac1a78902fb615 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Sat, 6 May 2023 10:17:28 +0000 Subject: [PATCH 10/12] add config/default_config/notice.yaml. Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- config/default_config/notice.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 config/default_config/notice.yaml diff --git a/config/default_config/notice.yaml b/config/default_config/notice.yaml new file mode 100644 index 0000000..0db3a25 --- /dev/null +++ b/config/default_config/notice.yaml @@ -0,0 +1,5 @@ +# IYUU(https://iyuu.cn/) +iyuu: + +# Server酱(https://sct.ftqq.com/) +sct: \ No newline at end of file From 527f59f5b6e33ad7a5839b9a316d3fc5aeee9d4d Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Sat, 6 May 2023 10:18:50 +0000 Subject: [PATCH 11/12] update lib/events/offline.js. Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- lib/events/offline.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/events/offline.js b/lib/events/offline.js index 8fb9cf3..d9d87b8 100644 --- a/lib/events/offline.js +++ b/lib/events/offline.js @@ -1,4 +1,6 @@ import EventListener from '../listener/listener.js' +import fetch from 'node-fetch' +import cfg from '../config/config.js' /** * 监听下线事件 @@ -11,5 +13,13 @@ export default class onlineEvent extends EventListener { /** 默认方法 */ async execute (e) { logger.mark('掉线了') + let config = cfg.getConfig('notice') + let title = `Miao-Yunzai(${Bot.nickname})已离线，请关注` + if (config.iyuu) { + await fetch(`https://iyuu.cn/${config.iyuu}.send?text=${title}&desp=${e.message}`) + } + if (config.sct) { + await fetch(`https://sctapi.ftqq.com/${config.sct}.send?title=${title}&content=${e.message}`) + } } } From e18e8935c61609e38b874c98a19e4fb7c2d4a65f Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Sat, 6 May 2023 11:15:40 +0000 Subject: [PATCH 12/12] update package.json. Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7120f6d..6a6f1b4 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "chalk": "^5.2.0", "chokidar": "^3.5.3", "https-proxy-agent": "5.0.1", - "icqq": "^0.3.2", + "icqq": "^0.3.1", "image-size": "^1.0.2", "inquirer": "^8.2.5", "lodash": "^4.17.21",