From c36bb772869145ff328581aeabc281950ff8a2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Tue, 6 Aug 2024 14:48:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=88=E5=B9=B6=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E8=A7=A3=E6=9E=90=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/src/apis/msg.ts                      |  5 +-
 src/core/src/entities/msg.ts                  |  6 +-
 .../action/go-cqhttp/GetGroupMsgHistory.ts    |  2 +-
 src/onebot11/constructor.ts                   | 60 ++++++++++++-------
 src/onebot11/log.ts                           |  4 +-
 5 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/src/core/src/apis/msg.ts b/src/core/src/apis/msg.ts
index 76e2faa6..143d1a22 100644
--- a/src/core/src/apis/msg.ts
+++ b/src/core/src/apis/msg.ts
@@ -67,6 +67,9 @@ setTimeout(() => {
 // }, 25000)
 
 export class NTQQMsgApi {
+  static async FetchLongMsg(peer: Peer, msgId: string) {
+    return napCatCore.session.getMsgService().fetchLongMsg(peer, msgId);
+  }
   static async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
     //console.log(peer, msgSeq, emojiId, emojiType, count);
     return napCatCore.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, "", false, 20)
@@ -100,7 +103,7 @@ export class NTQQMsgApi {
       filterMsgFromTime: '0',
       isReverseOrder: false,
       isIncludeCurrent: true,
-      pageLimit: 1,
+      pageLimit: count,
     });
     return ret;
   }
diff --git a/src/core/src/entities/msg.ts b/src/core/src/entities/msg.ts
index d450931b..3f5d1ab8 100644
--- a/src/core/src/entities/msg.ts
+++ b/src/core/src/entities/msg.ts
@@ -731,10 +731,12 @@ export interface MultiForwardMsgElement {
 }
 
 export interface RawMessage {
+  parentMsgPeer: Peer;
+  parentMsgIdList:string[];
+  id?: number;//扩展字段 用于处理OB11 ID
   guildId: string;
   msgRandom: string;
-  // int32, 自己维护的消息id
-  id?: number;
+
 
   msgId: string;
 
diff --git a/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
index 15f06947..15f1aa61 100644
--- a/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
+++ b/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
@@ -37,7 +37,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
       peerUid: group.groupCode
     };
     let msgList: RawMessage[];
-    if (!payload.message_seq) {
+    if (!payload.message_seq || payload.message_seq === 0) {
       msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, count)).msgList;
     } else {
       const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(targetMsgShortId ?? (payload.message_seq ?? 0)))?.MsgId || '0';
diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts
index 17f6f4d3..4bd35f84 100644
--- a/src/onebot11/constructor.ts
+++ b/src/onebot11/constructor.ts
@@ -208,13 +208,13 @@ export class OB11Constructor {
           chatType: msg.chatType,
           guildId: '',
         },
-        msg.msgId,
-        msg.msgSeq,
-        msg.senderUid,
-        element.elementId,
-        element.elementType.toString(),
-        FileElement.fileSize,
-        FileElement.fileName
+          msg.msgId,
+          msg.msgSeq,
+          msg.senderUid,
+          element.elementId,
+          element.elementType.toString(),
+          FileElement.fileSize,
+          FileElement.fileName
         );
       }
       else if (element.videoElement) {
@@ -255,13 +255,13 @@ export class OB11Constructor {
           chatType: msg.chatType,
           guildId: '',
         },
-        msg.msgId,
-        msg.msgSeq,
-        msg.senderUid,
-        element.elementId,
-        element.elementType.toString(),
-        videoElement.fileSize || '0',
-        videoElement.fileName
+          msg.msgId,
+          msg.msgSeq,
+          msg.senderUid,
+          element.elementId,
+          element.elementType.toString(),
+          videoElement.fileSize || '0',
+          videoElement.fileName
         );
       }
       else if (element.pttElement) {
@@ -276,13 +276,13 @@ export class OB11Constructor {
           chatType: msg.chatType,
           guildId: '',
         },
-        msg.msgId,
-        msg.msgSeq,
-        msg.senderUid,
-        element.elementId,
-        element.elementType.toString(),
-        element.pttElement.fileSize || '0',
-        element.pttElement.fileUuid || ''
+          msg.msgId,
+          msg.msgSeq,
+          msg.senderUid,
+          element.elementId,
+          element.elementType.toString(),
+          element.pttElement.fileSize || '0',
+          element.pttElement.fileUuid || ''
         );
         //以uuid作为文件名
       }
@@ -327,6 +327,24 @@ export class OB11Constructor {
       else if (element.multiForwardMsgElement) {
         message_data['type'] = OB11MessageDataType.forward;
         message_data['data']['id'] = msg.msgId;
+        const ParentMsgPeer = msg.parentMsgPeer ?? { chatType: msg.chatType, guildId: '', peerUid: msg.peerUid };
+        //判断是否在合并消息内
+        msg.parentMsgIdList = msg.parentMsgIdList ?? [];
+        //首次列表不存在则开始创建
+        msg.parentMsgIdList.push(msg.msgId);
+        //let parentMsgId = msg.parentMsgIdList[msg.parentMsgIdList.length - 2 < 0 ? 0 : msg.parentMsgIdList.length - 2];
+        //加入自身MsgId
+        let MultiMsgs = (await NTQQMsgApi.getMultiMsg(ParentMsgPeer, msg.parentMsgIdList[0], msg.msgId))?.msgList;
+        //拉取下级消息
+        if (!MultiMsgs) continue;
+        //拉取失败则跳过
+        for (let MultiMsg of MultiMsgs) {
+          //对每条拉取的消息传递ParentMsgPeer修正Peer
+          MultiMsg.parentMsgPeer = ParentMsgPeer;
+          MultiMsg.parentMsgIdList = msg.parentMsgIdList;
+          let msgList = await OB11Constructor.message(MultiMsg);
+          console.log(msgList);
+        }
       }
       if ((message_data.type as string) !== 'unknown' && message_data.data) {
         const cqCode = encodeCQCode(message_data);
diff --git a/src/onebot11/log.ts b/src/onebot11/log.ts
index c6a9704f..30f89841 100644
--- a/src/onebot11/log.ts
+++ b/src/onebot11/log.ts
@@ -2,7 +2,7 @@ import { OB11Message } from '@/onebot11/types';
 import { log } from '@/common/utils/log';
 import { getGroup, getGroupMember, selfInfo } from '@/core/data';
 import exp from 'constants';
-import { Group } from '@/core';
+import { Group, NTQQMsgApi } from '@/core';
 import chalk from 'chalk';
 
 const spSegColor = chalk.blue;// for special segment
@@ -67,7 +67,7 @@ export async function logMessage(ob11Message: OB11Message) {
         msgParts.push(spSegColor(`[视频|${segment.data.url}]`));
       }
       else if (segment.type === 'forward') {
-        msgParts.push(spSegColor(`[转发|${JSON.stringify(segment.data.id)}]`));
+        msgParts.push(spSegColor(`[转发|${segment.data.id}]`));
       }
       else {
         msgParts.push(spSegColor(`[未实现|${JSON.stringify(segment)}]`));