From d31c09ace796343bd61e11e41f9df1704c1f26a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8C=8C?= Date: Fri, 12 May 2023 10:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=BD=AC=E5=8F=91=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/other/sendLog.js | 26 ++------------ plugins/other/update.js | 34 +++--------------- plugins/system/add.js | 75 +++++----------------------------------- 3 files changed, 17 insertions(+), 118 deletions(-) diff --git a/plugins/other/sendLog.js b/plugins/other/sendLog.js index 03ea644..566f352 100644 --- a/plugins/other/sendLog.js +++ b/plugins/other/sendLog.js @@ -80,33 +80,13 @@ export class sendLog extends plugin { } async makeForwardMsg (title, msg) { - let nickname = this.e.bot.nickname - if (this.e.isGroup) { - let info = await this.e.bot.getGroupMemberInfo(this.e.group_id, this.e.bot.uin) - nickname = info.card ?? info.nickname - } - let userInfo = { - user_id: this.e.bot.uin, - nickname - } - - let forwardMsg = [ - { - ...userInfo, - message: title - }, - { - ...userInfo, - message: msg - } - ] + let forwardMsg = [{ message: title }, { message: msg }] /** 制作转发内容 */ - if (this.e.isGroup) { + if (this.e.group) forwardMsg = await this.e.group.makeForwardMsg(forwardMsg) - } else { + else forwardMsg = await this.e.friend.makeForwardMsg(forwardMsg) - } /** 处理描述 */ forwardMsg.data = forwardMsg.data diff --git a/plugins/other/update.js b/plugins/other/update.js index d3781e4..9d3d9f3 100644 --- a/plugins/other/update.js +++ b/plugins/other/update.js @@ -262,40 +262,16 @@ export class update extends plugin { } async makeForwardMsg (title, msg, end) { - let nickname = this.e.bot.nickname - if (this.e.isGroup) { - let info = await this.e.bot.getGroupMemberInfo(this.e.group_id, this.e.bot.uin) - nickname = info.card ?? info.nickname - } - let userInfo = { - user_id: this.e.bot.uin, - nickname - } + let forwardMsg = [{ message: title }, { message: msg }] - let forwardMsg = [ - { - ...userInfo, - message: title - }, - { - ...userInfo, - message: msg - } - ] - - if (end) { - forwardMsg.push({ - ...userInfo, - message: end - }) - } + if (end) + forwardMsg.push({ message: end }) /** 制作转发内容 */ - if (this.e.isGroup) { + if (this.e.group) forwardMsg = await this.e.group.makeForwardMsg(forwardMsg) - } else { + else forwardMsg = await this.e.friend.makeForwardMsg(forwardMsg) - } /** 处理描述 */ forwardMsg.data = forwardMsg.data diff --git a/plugins/system/add.js b/plugins/system/add.js index b57012a..375284e 100644 --- a/plugins/system/add.js +++ b/plugins/system/add.js @@ -127,12 +127,6 @@ export class add extends plugin { return false } if (groupCfg.imgAddLimit == 1) { - if (!this.e.bot.gml.has(this.group_id)) { - return false - } - if (!this.e.bot.gml.get(this.group_id).get(this.e.user_id)) { - return false - } if (!this.e.member.is_admin) { this.e.reply('暂无权限，只有管理员才能操作') return false @@ -662,7 +656,7 @@ export class add extends plugin { for (let i in arr) { if (num >= page * pageSize) break - let keyWord = await this.keyWordTran(arr[i].key) + let keyWord = arr[i].key if (!keyWord) continue if (Array.isArray(keyWord)) { @@ -687,45 +681,28 @@ export class add extends plugin { title = `表情${search}，${count}条` } - let forwardMsg = await this.makeForwardMsg(this.e.bot.uin, title, msg, end) + let forwardMsg = await this.makeForwardMsg(title, msg, end) this.e.reply(forwardMsg) } - async makeForwardMsg (qq, title, msg, end = '') { - let nickname = this.e.bot.nickname - if (this.e.isGroup) { - let info = await this.e.bot.getGroupMemberInfo(this.e.group_id, qq) - nickname = info.card ?? info.nickname - } - let userInfo = { - user_id: this.e.bot.uin, - nickname - } - - let forwardMsg = [ - { - ...userInfo, - message: title - } - ] + async makeForwardMsg (title, msg, end = '') { + let forwardMsg = [{ message: title }] let msgArr = lodash.chunk(msg, 40) msgArr.forEach(v => { v[v.length - 1] = lodash.trim(v[v.length - 1], '\n') - forwardMsg.push({ ...userInfo, message: v }) + forwardMsg.push({ message: v }) }) - if (end) { - forwardMsg.push({ ...userInfo, message: end }) - } + if (end) + forwardMsg.push({ message: end }) /** 制作转发内容 */ - if (this.e.isGroup) { + if (this.e.group) forwardMsg = await this.e.group.makeForwardMsg(forwardMsg) - } else { + else forwardMsg = await this.e.friend.makeForwardMsg(forwardMsg) - } /** 处理描述 */ forwardMsg.data = forwardMsg.data @@ -741,38 +718,4 @@ export class add extends plugin { let offset = (pageNo - 1) * pageSize return offset + pageSize >= array.length ? array.slice(offset, array.length) : array.slice(offset, offset + pageSize) } - - /** 关键词转换成可发送消息 */ - async keyWordTran (msg) { - /** 图片 */ - if (msg.includes('{image')) { - let tmp = msg.split('{image') - if (tmp.length > 2) return false - - let md5 = tmp[1].replace(/}|_|:/g, '') - - msg = segment.image(`http://gchat.qpic.cn/gchatpic_new/0/0-0-${md5}/0`) - msg.asface = true - } else if (msg.includes('{at:')) { - let tmp = msg.match(/{at:(.+?)}/g) - - for (let qq of tmp) { - qq = qq.match(/[1-9][0-9]{4,14}/g)[0] - let member = await await this.e.bot.getGroupMemberInfo(this.group_id, Number(qq)).catch(() => { }) - let name = member?.card ?? member?.nickname - if (!name) continue - msg = msg.replace(`{at:${qq}}`, `@${name}`) - } - } else if (msg.includes('{face')) { - let tmp = msg.match(/{face(:|_)(.+?)}/g) - if (!tmp) return msg - msg = [] - for (let face of tmp) { - let id = face.match(/\d+/g) - msg.push(segment.face(id)) - } - } - - return msg - } }