Lexcubia
/
Miao-Yunzai
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !29 from touchscale/master

This commit is contained in:
touchscale 2023-04-24 23:57:27 +00:00 committed by Gitee
parent 23b194c6a7 360b476e87
commit 493b1207c0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/default_config/qq.yaml
View File

@ -2,5 +2,5 @@
qq: qq:
# 密码，为空则用扫码登录,扫码登录现在仅能在同一ip下进行 # 密码，为空则用扫码登录,扫码登录现在仅能在同一ip下进行
pwd: pwd:
# 1:安卓手机、 2:aPad 、 3:安卓手表、 4:MacOS 、 5:iPad # 1:安卓手机、 2:aPad 、 3:安卓手表、 4:MacOS 、 5:iPad 、 6:old_Android
platform: 5 platform: 5

3
lib/config/init.js
View File

@ -25,6 +25,9 @@ if (qq) {
break break
case 5: case 5:
title += ' iPad' title += ' iPad'
break
case 6:
title += ' old_Android'
} }
} }

9
lib/config/qq.js
View File

@ -32,16 +32,17 @@ export default async function createQQ () {
type: 'list', type: 'list',
message: '请选择登录端口：', message: '请选择登录端口：',
name: 'platform', name: 'platform',
default: '5', default: '6',
choices: ['iPad', '安卓手机', '安卓手表', 'MacOS', 'aPad'], choices: ['old_Android', 'iPad', '安卓手机', '安卓手表', 'MacOS', 'aPad'],
filter: (val) => { filter: (val) => {
switch (val) { switch (val) {
case 'old_Android':return 6
case 'iPad':return 5 case 'iPad':return 5
case 'MacOS':return 4 case 'MacOS':return 4
case '安卓手机':return 1 case '安卓手机':return 1
case '安卓手表':return 3 case '安卓手表':return 3
case 'aPad':return 2 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(/qq:/g, 'qq: ' + ret.QQ)
qq = qq.replace(/pwd:/g, `pwd: '${ret.pwd}'`) 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') fs.writeFileSync(`${file}qq.yaml`, qq, 'utf8')
let bot = fs.readFileSync(`${fileDef}bot.yaml`, 'utf8') let bot = fs.readFileSync(`${fileDef}bot.yaml`, 'utf8')

8
package.json
View File

@ -21,7 +21,7 @@
"chalk": "^5.2.0", "chalk": "^5.2.0",
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
"https-proxy-agent": "5.0.1", "https-proxy-agent": "5.0.1",
"icqq": "^0.2.3", "icqq": "^0.3.1",
"image-size": "^1.0.2", "image-size": "^1.0.2",
"inquirer": "^8.2.5", "inquirer": "^8.2.5",
"lodash": "^4.17.21", "lodash": "^4.17.21",
@ -30,14 +30,14 @@
"moment": "^2.29.4", "moment": "^2.29.4",
"node-fetch": "^3.3.1", "node-fetch": "^3.3.1",
"node-schedule": "^2.1.1", "node-schedule": "^2.1.1",
"node-xlsx": "^0.21.0", "node-xlsx": "^0.21.2",
"oicq": "^2.3.1", "oicq": "^2.3.1",
"pm2": "^5.3.0", "pm2": "^5.3.0",
"puppeteer": "^19.10.1", "puppeteer": "^19.11.0",
"redis": "^4.6.5", "redis": "^4.6.5",
"sequelize": "^6.31.0", "sequelize": "^6.31.0",
"sqlite3": "^5.1.6", "sqlite3": "^5.1.6",
"yaml": "^2.2.1" "yaml": "^2.2.2"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.39.0", "eslint": "^8.39.0",

4
plugins/other/update.js
View File

@ -34,7 +34,7 @@ export class update extends plugin {
] ]
}) })
this.typeName = 'Yunzai-Bot' this.typeName = 'Miao-Yunzai'
} }
async update () { async update () {
@ -256,7 +256,7 @@ export class update extends plugin {
let end = '' let end = ''
log = await this.makeForwardMsg(`${plugin || 'Yunzai-Bot'}更新日志，共${line}条`, log, end) log = await this.makeForwardMsg(`${plugin || 'Miao-Yunzai'}更新日志，共${line}条`, log, end)
return log return log
} }