From cc91a4c84e6d0842cf8e84a9f2a80fc60ba36378 Mon Sep 17 00:00:00 2001
From: sameu <hizcmua@163.com>
Date: Wed, 7 Jun 2023 04:52:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0makeForwardMsg?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BC=AA=E8=A3=85=E5=BC=80=E5=85=B3=20(#167)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common/common.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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