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

新增 go-cqhttp 请求处理，细节优化

This commit is contained in:
🌌 2023-07-27 11:57:24 +08:00
parent f20abbe767
commit cdf02345bd
7 changed files with 76 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/plugins/loader.js
View File

@ -161,8 +161,8 @@ class PluginsLoader {
/**
* 处理事件
*
* 参数文档 https://oicqjs.github.io/oicq/interfaces/GroupMessageEvent.html
* @param e icqq Events
* 参数文档 https://github.com/TimeRainStarSky/Yunzai/tree/docs
* @param e 事件
*/
async deal(e) {
/** 检查黑白名单 */

2
lib/plugins/plugin.js
View File

@ -22,7 +22,7 @@ export default class plugin {
this.name = name
/** 插件描述 */
this.dsc = dsc
/** 监听事件，默认message https://oicqjs.github.io/oicq/#events */
/** 监听事件，默认message */
this.event = event
/** 优先级 */
this.priority = priority

30
plugins/adapter/go-cqhttp.js
View File

@ -437,6 +437,23 @@ Bot.adapter.push(new class gocqhttpAdapter {
}
}
setFriendAddRequest(data, flag, approve, remark) {
return data.sendApi("set_friend_add_request", {
flag,
approve,
remark,
})
}
setGroupAddRequest(data, flag, sub_type, approve, reason) {
return data.sendApi("set_group_add_request", {
flag,
sub_type,
approve,
reason,
})
}
pickFriend(data, user_id) {
const i = {
...Bot[data.self_id].fl.get(user_id),
@ -568,6 +585,11 @@ Bot.adapter.push(new class gocqhttpAdapter {
getGroupArray: () => this.getGroupArray(data),
getGroupList: () => this.getGroupList(data),
getGroupMap: () => this.getGroupMap(data),
request_list: [],
getSystemMsg: () => Bot[data.self_id].request_list,
setFriendAddRequest: (flag, approve, remark) => this.setFriendAddRequest(data, flag, approve, remark),
setGroupAddRequest: (flag, sub_type, approve, reason) => this.setGroupAddRequest(data, flag, sub_type, approve, reason),
}
Bot[data.self_id].info = (await data.sendApi("get_login_info")).data
@ -761,19 +783,23 @@ Bot.adapter.push(new class gocqhttpAdapter {
makeRequest(data) {
switch (data.request_type) {
case "friend":
logger.info(`${logger.blue(`[${data.self_id}]`)} 加好友请求：[${data.user_id}] ${data.comment} ${data.flag}`)
logger.info(`${logger.blue(`[${data.self_id}]`)} 加好友请求：[${data.user_id}] ${data.comment}(${data.flag})`)
data.sub_type = "add"
data.friend = data.bot.pickFriend(data.user_id)
data.approve = approve => data.bot.setFriendAddRequest(data.flag, approve)
break
case "group":
logger.info(`${logger.blue(`[${data.self_id}]`)} 加群请求：[${data.group_id}, ${data.user_id}] ${data.sub_type} ${data.comment} ${data.flag}`)
logger.info(`${logger.blue(`[${data.self_id}]`)} 加群请求：[${data.group_id}, ${data.user_id}] ${data.sub_type} ${data.comment}(${data.flag})`)
data.friend = data.bot.pickFriend(data.user_id)
data.group = data.bot.pickGroup(data.group_id)
data.member = data.group.pickMember(data.user_id)
data.approve = approve => data.bot.setGroupAddRequest(data.flag, data.sub_type, approve)
break
default:
logger.warn(`${logger.blue(`[${data.self_id}]`)} 未知请求：${logger.magenta(JSON.stringify(data))}`)
}
data.bot.request_list.push(data)
if (data.sub_type)
Bot.emit(`${data.post_type}.${data.request_type}.${data.sub_type}`, data)
Bot.emit(`${data.post_type}.${data.request_type}`, data)

103
plugins/other/update.js
View File

@ -19,11 +19,11 @@ export class update extends plugin {
priority: 4000,
rule: [
{
reg: '^#更新日志$',
reg: '^#更新日志',
fnc: 'updateLog'
},
{
reg: '^#(强制)*更新(.*)',
reg: '^#(强制)?更新',
fnc: 'update'
},
{
@ -39,21 +39,14 @@ export class update extends plugin {
async update() {
if (!this.e.isMaster) return false
if (uping) {
await this.reply('已有命令更新中..请勿重复操作')
return
}
if (uping) return this.reply('已有命令更新中..请勿重复操作')
if (/详细|详情|面板|面版/.test(this.e.msg)) return false
/** 获取插件 */
let plugin = this.getPlugin()
const plugin = this.getPlugin()
if (plugin === false) return false
/** 检查git安装 */
if (!await this.checkGit()) return
/** 执行更新 */
await this.runUpdate(plugin)
@ -64,19 +57,9 @@ export class update extends plugin {
}
}
async checkGit() {
let ret = await execSync('git --version', { encoding: 'utf-8' })
if (!ret || !ret.includes('git version')) {
await this.reply('请先安装git')
return false
}
return true
}
getPlugin(plugin = '') {
if (!plugin) {
plugin = this.e.msg.replace(/#|更新|强制/g, '')
plugin = this.e.msg.replace(/#(强制)?更新(日志)?/, '')
if (!plugin) return ''
}
@ -108,14 +91,13 @@ export class update extends plugin {
if (plugin)
cm = `cd "plugins/${plugin}" && ${cm}`
this.oldCommitId = await this.getcommitId(plugin)
logger.mark(`${this.e.logFnc} 开始${type}：${this.typeName}`)
await this.reply(`开始#${type}${this.typeName}`)
await this.reply(`开始${type} ${this.typeName}`)
uping = true
let ret = await this.execSync(cm)
const ret = await this.execSync(cm)
uping = false
if (ret.error) {
@ -124,39 +106,33 @@ export class update extends plugin {
return false
}
let time = await this.getTime(plugin)
const time = await this.getTime(plugin)
if (/Already up|已经是最新/g.test(ret.stdout)) {
await this.reply(`${this.typeName}已经是最新\n最后更新时间：${time}`)
await this.reply(`${this.typeName} 已是最新\n最后更新时间：${time}`)
} else {
await this.reply(`${this.typeName}更新成功\n更新时间：${time}`)
await this.reply(`${this.typeName} 更新成功\n更新时间：${time}`)
this.isUp = true
let log = await this.getLog(plugin)
await this.reply(log)
await this.reply(await this.getLog(plugin))
}
logger.mark(`${this.e.logFnc} 最后更新时间：${time}`)
return true
}
async getcommitId(plugin = '') {
let cm = 'git rev-parse --short HEAD'
if (plugin) {
if (plugin)
cm = `cd "plugins/${plugin}" && git rev-parse --short HEAD`
}
let commitId = await execSync(cm, { encoding: 'utf-8' })
commitId = lodash.trim(commitId)
return commitId
const commitId = await execSync(cm, { encoding: 'utf-8' })
return lodash.trim(commitId)
}
async getTime(plugin = '') {
let cm = 'git log -1 --pretty=format:"%cd" --date=format:"%F %T"'
if (plugin) {
if (plugin)
cm = `cd "plugins/${plugin}" && git log -1 --pretty=format:"%cd" --date=format:"%F %T"`
}
let time = ''
try {
@ -171,37 +147,33 @@ export class update extends plugin {
}
async gitErr(err, stdout) {
let msg = '更新失败！'
let errMsg = err.toString()
const msg = '更新失败！'
const errMsg = err.toString()
stdout = stdout.toString()
if (errMsg.includes('Timed out')) {
let remote = errMsg.match(/'(.+?)'/g)[0].replace(/'/g, '')
await this.reply(msg + `\n连接超时：${remote}`)
return
const remote = errMsg.match(/'(.+?)'/g)[0].replace(/'/g, '')
return this.reply(`${msg}\n连接超时：${remote}`)
}
if (/Failed to connect|unable to access/g.test(errMsg)) {
let remote = errMsg.match(/'(.+?)'/g)[0].replace(/'/g, '')
await this.reply(msg + `\n连接失败：${remote}`)
return
const remote = errMsg.match(/'(.+?)'/g)[0].replace(/'/g, '')
return this.reply(`${msg}\n连接失败：${remote}`)
}
if (errMsg.includes('be overwritten by merge')) {
await this.reply(msg + `存在冲突：\n${errMsg}\n` + '请解决冲突后再更新，或者执行#强制更新，放弃本地修改')
return
return this.reply(`${msg}\n存在冲突：\n${errMsg}\n请解决冲突后再更新，或者执行#强制更新，放弃本地修改`)
}
if (stdout.includes('CONFLICT')) {
await this.reply([msg + '存在冲突\n', errMsg, stdout, '\n请解决冲突后再更新，或者执行#强制更新，放弃本地修改'])
return
return this.reply(`${msg}\n存在冲突：\n${errMsg}${stdout}\n请解决冲突后再更新，或者执行#强制更新，放弃本地修改`)
}
await this.reply([errMsg, stdout])
return this.reply([errMsg, stdout])
}
async updateAll() {
let dirs = fs.readdirSync('./plugins/')
const dirs = fs.readdirSync('./plugins/')
await this.runUpdate()
@ -223,17 +195,16 @@ export class update extends plugin {
}
async getLog(plugin = '') {
let cm = 'git log -20 --pretty=format:"%h||[%cd] %s" --date=format:"%F %T"'
if (plugin) {
let cm = 'git log -100 --pretty=format:"%h||[%cd] %s" --date=format:"%F %T"'
if (plugin)
cm = `cd "plugins/${plugin}" && ${cm}`
}
let logAll
try {
logAll = await execSync(cm, { encoding: 'utf-8' })
} catch (error) {
logger.error(error.toString())
this.reply(error.toString())
await this.reply(error.toString())
}
if (!logAll) return false
@ -248,19 +219,25 @@ export class update extends plugin {
log.push(str[1])
}
let line = log.length
log = log.join('\n\n')
log = log.join('\n')
if (log.length <= 0) return ''
let end = ''
try {
end = await execSync('git config -l', { encoding: 'utf-8' })
end = end.match(/remote\..*\.url=.+/g).join('\n').replace(/remote\..*\.url=/g, '')
} catch (error) {
logger.error(error.toString())
await this.reply(error.toString())
}
log = await common.makeForwardMsg(this.e, [log, end], `${plugin || 'TRSS-Yunzai'}更新日志，共${line}条`)
return log
return common.makeForwardMsg(this.e, [log, end], `${plugin || 'TRSS-Yunzai'} 更新日志，共${line}条`)
}
async updateLog() {
let log = await this.getLog()
await this.reply(log)
const plugin = this.getPlugin()
if (plugin === false) return false
return this.reply(await this.getLog(plugin))
}
}

2
plugins/system/add.js
View File

@ -223,7 +223,7 @@ export class add extends plugin {
fs.writeFileSync(`${this.path}${file.name}`, file.buffer)
return file.name
}
return url
return data.url
}
async getMessage() {

2
plugins/system/friend.js
View File

@ -10,7 +10,7 @@ export class friend extends plugin {
})
}
async accept () {
async accept() {
if (this.e.sub_type == 'add' || this.e.sub_type == 'single') {
if (cfg.other.autoFriend == 1) {
logger.mark(`[自动同意][添加好友] ${this.e.user_id}`)