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

Merge branch 'pr_29' 

# Conflicts:
#	config/default_config/qq.yaml
#	lib/config/init.js
#	lib/config/qq.js
This commit is contained in:
Kokomi 2023-04-26 04:53:11 +08:00
parent 0494217518 360b476e87
commit babefc5ad3
5 changed files with 11 additions and 12 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 、 6:安卓8.8.88 # 1:安卓手机、 2:aPad 、 3:安卓手表、 4:MacOS 、 5:iPad 、 6:old_Android
platform: 5 platform: 5

3
lib/config/init.js
View File

@ -31,10 +31,9 @@ async function UpdateTitle() {
title += ' iPad' title += ' iPad'
break break
case 6: case 6:
title += ' 安卓8.8.88' title += ' old_Android'
break break
default: default:
} }
} }
/** 设置标题 */ /** 设置标题 */

6
lib/config/qq.js
View File

@ -33,10 +33,10 @@ export default async function createQQ () {
message: '请选择登录端口：', message: '请选择登录端口：',
name: 'platform', name: 'platform',
default: '6', default: '6',
choices: ['安卓8.8.88','iPad', '安卓手机', '安卓手表', 'MacOS', 'aPad'], choices: ['old_Android', 'iPad', '安卓手机', '安卓手表', 'MacOS', 'aPad'],
filter: (val) => { filter: (val) => {
switch (val) { switch (val) {
case '安卓8.8.88':return 6 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
@ -70,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')

6
package.json
View File

@ -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
} }