diff --git a/lib/common/common.js b/lib/common/common.js index 671a505..93e95b3 100644 --- a/lib/common/common.js +++ b/lib/common/common.js @@ -64,28 +64,28 @@ function mkdirs (dirname) { * @param e icqq消息e * @param msg 消息数组 * @param dec 转发描述 + * @param msgsscr 转发信息是否为Bot */ -async function makeForwardMsg (e, msg = [], dec = '') { +async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) { // 是频道直接返回 join if (e.isGuild) return msg.join("\n") - let nickname = e.bot.nickname - + let name = msgsscr ? this.e.sender.card || this.e.user_id : Bot.nickname + let id = msgsscr ? this.e.user_id : Bot.uin if (e.isGroup) { let info = await e.bot.getGroupMemberInfo(e.group_id, e.bot.uin) - nickname = info.card || info.nickname } let userInfo = { - user_id: e.bot.uin, - nickname + user_id: id + nickname: name } let forwardMsg = [] - msg.forEach(v => { + msg.forEach(msg => { forwardMsg.push({ ...userInfo, - message: v + message: msg }) })