From b5e00425a7b43a1c5645ba829677a10454897f50 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Mon, 24 Apr 2023 02:54:28 +0000 Subject: [PATCH 1/7] =?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=88=E6=9B=B4=E6=96=B0=E5=90=8E=E9=9C=80?= =?UTF-8?q?=E8=A6=81pnpm=20install=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=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 42f5361..94064af 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "moment": "^2.29.4", "node-fetch": "^3.3.1", "node-schedule": "^2.1.1", - "node-xlsx": "^0.21.0", + "node-xlsx": "^0.21.2", "oicq": "^2.3.1", "pm2": "^5.3.0", "puppeteer": "^19.10.1", From 3b79c639077c96af76c140acfa6aef6e1366345c Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Mon, 24 Apr 2023 07:15:05 +0000 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E7=A4=BAYunzai-?= =?UTF-8?q?Bot=E6=94=B9=E4=B8=BAMiao-Yunzai?= 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/other/update.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/other/update.js b/plugins/other/update.js index 36b4f55..d27572a 100644 --- a/plugins/other/update.js +++ b/plugins/other/update.js @@ -34,7 +34,7 @@ export class update extends plugin { ] }) - this.typeName = 'Yunzai-Bot' + this.typeName = 'Miao-Yunzai' } async update () { @@ -256,7 +256,7 @@ export class update extends plugin { let end = '' - log = await this.makeForwardMsg(`${plugin || 'Yunzai-Bot'}更新日志，共${line}条`, log, end) + log = await this.makeForwardMsg(`${plugin || 'Miao-Yunzai'}更新日志，共${line}条`, log, end) return log } From da0048cc810eb581a6132a75acffcfe7cfc3f20a Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Mon, 24 Apr 2023 23:29:58 +0000 Subject: [PATCH 3/7] =?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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 94064af..fe92cff 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,11 @@ "node-xlsx": "^0.21.2", "oicq": "^2.3.1", "pm2": "^5.3.0", - "puppeteer": "^19.10.1", + "puppeteer": "^19.11.0", "redis": "^4.6.5", "sequelize": "^6.31.0", "sqlite3": "^5.1.6", - "yaml": "^2.2.1" + "yaml": "^2.2.2" }, "devDependencies": { "eslint": "^8.39.0", From fe65ccb16494855c17d62223ce964a4b9b68fd2f Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Mon, 24 Apr 2023 23:35:49 +0000 Subject: [PATCH 4/7] =?UTF-8?q?icqq=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AE=89=E5=8D=93QQ8.8.88=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8D=8F=E8=AE=AE=EF=BC=8CPlatform=20=3D=206=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95=E7=9A=84=E5=8F=AF=E5=B0=9D?= =?UTF-8?q?=E8=AF=95=EF=BC=88=E6=9B=B4=E6=96=B0=E5=90=8E=E9=9C=80=E8=A6=81?= =?UTF-8?q?pnpm=20install=E5=8D=87=E7=BA=A7=E4=BE=9D=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 fe92cff..218b917 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.2.3", + "icqq": "^0.3.1", "image-size": "^1.0.2", "inquirer": "^8.2.5", "lodash": "^4.17.21", From ce4c2ae14b0d9cb171064527726f09517a957f84 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Mon, 24 Apr 2023 23:55:57 +0000 Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=8F=E8=AE=AE6old=5F?= =?UTF-8?q?Android?= 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> --- config/default_config/qq.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default_config/qq.yaml b/config/default_config/qq.yaml index b15e562..6745bac 100644 --- a/config/default_config/qq.yaml +++ b/config/default_config/qq.yaml @@ -2,5 +2,5 @@ qq: # 密码，为空则用扫码登录,扫码登录现在仅能在同一ip下进行 pwd: -# 1:安卓手机、 2:aPad 、 3:安卓手表、 4:MacOS 、 5:iPad +# 1:安卓手机、 2:aPad 、 3:安卓手表、 4:MacOS 、 5:iPad 、 6:old_Android platform: 5 \ No newline at end of file From 6fa6a72cffb9db4922cca5d60ccb6a2405b6f449 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Mon, 24 Apr 2023 23:56:54 +0000 Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=8F=E8=AE=AE6=20=20?= =?UTF-8?q?old=5FAndroid?= 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> --- lib/config/init.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/config/init.js b/lib/config/init.js index c59a04f..9c7047d 100644 --- a/lib/config/init.js +++ b/lib/config/init.js @@ -25,6 +25,9 @@ if (qq) { break case 5: title += ' iPad' + break + case 6: + title += ' old_Android' } } From 360b476e87e1f84c2aa1817a0c8a3a4a20114895 Mon Sep 17 00:00:00 2001 From: touchscale <11134128+touchscale@user.noreply.gitee.com> Date: Mon, 24 Apr 2023 23:57:20 +0000 Subject: [PATCH 7/7] update lib/config/qq.js. Signed-off-by: touchscale <11134128+touchscale@user.noreply.gitee.com> --- lib/config/qq.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/config/qq.js b/lib/config/qq.js index 7896a71..36fa306 100644 --- a/lib/config/qq.js +++ b/lib/config/qq.js @@ -32,16 +32,17 @@ export default async function createQQ () { type: 'list', message: '请选择登录端口：', name: 'platform', - default: '5', - choices: ['iPad', '安卓手机', '安卓手表', 'MacOS', 'aPad'], + default: '6', + choices: ['old_Android', 'iPad', '安卓手机', '安卓手表', 'MacOS', 'aPad'], filter: (val) => { switch (val) { + case 'old_Android':return 6 case 'iPad':return 5 case 'MacOS':return 4 case '安卓手机':return 1 case '安卓手表':return 3 case 'aPad':return 2 - default:return 5 + default:return 6 } } } @@ -69,7 +70,7 @@ export default async function createQQ () { qq = qq.replace(/qq:/g, 'qq: ' + ret.QQ) qq = qq.replace(/pwd:/g, `pwd: '${ret.pwd}'`) - qq = qq.replace(/platform: [1-5]/g, 'platform: ' + Number(ret.platform)) + qq = qq.replace(/platform: [1-6]/g, 'platform: ' + Number(ret.platform)) fs.writeFileSync(`${file}qq.yaml`, qq, 'utf8') let bot = fs.readFileSync(`${fileDef}bot.yaml`, 'utf8')