From f12cf59137008d046f590297aab719fcc77feaa0 Mon Sep 17 00:00:00 2001
From: pk5ls20 <pk5ls20@outlook.com>
Date: Sun, 27 Oct 2024 09:59:38 +0800
Subject: [PATCH] feat: enhance compatibility of `upload_forward_msg` with
 go-cqhttp

---
 src/onebot/action/msg/SendMsg.ts | 8 ++++----
 src/onebot/types/message.ts      | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts
index d2f79292..afe725ce 100644
--- a/src/onebot/action/msg/SendMsg.ts
+++ b/src/onebot/action/msg/SendMsg.ts
@@ -174,8 +174,8 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
 
                 if (getSpecialMsgNum({message: OB11Data}, OB11MessageDataType.node)) {
                     const uploadReturnData = await this.uploadForwardedNodesPacket(msgPeer, OB11Data as OB11MessageNode[], node.data.source, node.data.news, node.data.summary, node.data.prompt, {
-                        user_id: node.data.user_id?.toString() ?? parentMeta?.user_id ?? this.core.selfInfo.uin,
-                        nickname: node.data.nickname ?? parentMeta?.nickname ?? "QQ用户",
+                        user_id: (node.data.user_id || node.data.uin)?.toString() ?? parentMeta?.user_id ?? this.core.selfInfo.uin,
+                        nickname: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? "QQ用户",
                     }, dp + 1);
                     sendElements = uploadReturnData?.finallySendElements ? [uploadReturnData.finallySendElements] : [];
                 } else {
@@ -184,8 +184,8 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 }
 
                 const packetMsgElements: rawMsgWithSendMsg = {
-                    senderUin: Number(node.data.user_id ?? parentMeta?.user_id) || +this.core.selfInfo.uin,
-                    senderName: node.data.nickname ?? parentMeta?.nickname ?? "QQ用户",
+                    senderUin: Number((node.data.user_id || node.data.uin) ?? parentMeta?.user_id) || +this.core.selfInfo.uin,
+                    senderName: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? "QQ用户",
                     groupId: msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : undefined,
                     time: Number(node.data.time) || Date.now(),
                     msg: sendElements,
diff --git a/src/onebot/types/message.ts b/src/onebot/types/message.ts
index 3226d7a0..c97357fe 100644
--- a/src/onebot/types/message.ts
+++ b/src/onebot/types/message.ts
@@ -150,7 +150,9 @@ export interface OB11MessageNode {
     data: {
         id?: string
         user_id?: number | string  // number
+        uin?: number | string  // number, compatible with go-cqhttp
         nickname: string
+        name?: string // compatible with go-cqhttp
         content: OB11MessageMixType
         source?: string,
         news?: { text: string }[],