From 37f40a2635a06c85da6dbd320121437f038571e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E7=91=BE?= <shijinn520@gmail.com>
Date: Thu, 22 Jan 2026 13:20:32 +0800
Subject: [PATCH] feat: support msg_seq parameter in reply message construction
 (#1529)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: support msg_seq parameter in reply message construction

- Add optional 'seq' parameter to OB11MessageReply for using msg_seq
- Prioritize seq over id for querying reply messages
- Maintain backward compatibility with existing id parameter
- Update type definitions across backend and frontend
- Update validation schemas for message nodes

close #1523

* Update debug button label in NetworkDisplayCard

Changed the button label from '关闭调试'/'开启调试' to '默认'/'调试' based on the debug state for improved clarity.

---------

Co-authored-by: 手瓜一十雪 <nanaeonn@outlook.com>
---
 packages/napcat-onebot/api/msg.ts             |  34 ++-
 packages/napcat-onebot/types/message.ts       |   3 +-
 .../components/display_card/common_card.tsx   |   2 +-
 .../src/const/ob_api/message/node.ts          |   3 +-
 .../src/types/onebot/segment.ts               | 201 +++++++++---------
 5 files changed, 132 insertions(+), 111 deletions(-)

diff --git a/packages/napcat-onebot/api/msg.ts b/packages/napcat-onebot/api/msg.ts
index 94f948aa..6f267d42 100644
--- a/packages/napcat-onebot/api/msg.ts
+++ b/packages/napcat-onebot/api/msg.ts
@@ -587,15 +587,33 @@ export class OneBotMsgApi {
       return at(atQQ, uid, NTMsgAtType.ATTYPEONE, info.nick || '');
     },
 
-    [OB11MessageDataType.reply]: async ({ data: { id } }) => {
-      const replyMsgM = MessageUnique.getMsgIdAndPeerByShortId(parseInt(id));
-      if (!replyMsgM) {
-        this.core.context.logger.logWarn('回复消息不存在', id);
+    [OB11MessageDataType.reply]: async ({ data: { id, seq } }, context) => {
+      let replyMsg: RawMessage | undefined;
+      let replyMsgPeer: Peer | undefined;
+
+      // 优先使用 seq
+      if (seq) {
+        const msgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(
+          context.peer, seq.toString(), 1, true, true
+        )).msgList;
+        replyMsg = msgList[0];
+        replyMsgPeer = context.peer;
+      } else if (id) {
+        // 降级使用 id
+        const replyMsgM = MessageUnique.getMsgIdAndPeerByShortId(parseInt(id));
+        if (!replyMsgM) {
+          this.core.context.logger.logWarn('回复消息不存在', id);
+          return undefined;
+        }
+        replyMsg = (await this.core.apis.MsgApi.getMsgsByMsgId(
+          replyMsgM.Peer, [replyMsgM.MsgId])).msgList[0];
+        replyMsgPeer = replyMsgM.Peer;
+      } else {
+        this.core.context.logger.logWarn('回复消息缺少id或seq参数');
         return undefined;
       }
-      const replyMsg = (await this.core.apis.MsgApi.getMsgsByMsgId(
-        replyMsgM.Peer, [replyMsgM.MsgId])).msgList[0];
-      return replyMsg
+
+      return replyMsg && replyMsgPeer
         ? {
           elementType: ElementType.REPLY,
           elementId: '',
@@ -605,7 +623,7 @@ export class OneBotMsgApi {
             senderUin: replyMsg.senderUin,
             senderUinStr: replyMsg.senderUin,
             replyMsgClientSeq: replyMsg.clientSeq,
-            _replyMsgPeer: replyMsgM.Peer,
+            _replyMsgPeer: replyMsgPeer,
           },
         }
         : undefined;
diff --git a/packages/napcat-onebot/types/message.ts b/packages/napcat-onebot/types/message.ts
index 313f0ac5..6b8707de 100644
--- a/packages/napcat-onebot/types/message.ts
+++ b/packages/napcat-onebot/types/message.ts
@@ -159,7 +159,8 @@ export interface OB11MessageAt {
 export interface OB11MessageReply {
   type: OB11MessageDataType.reply;
   data: {
-    id: string;
+    id?: string;  // msg_id 的短ID映射
+    seq?: number; // msg_seq，优先使用
   };
 }
 
diff --git a/packages/napcat-webui-frontend/src/components/display_card/common_card.tsx b/packages/napcat-webui-frontend/src/components/display_card/common_card.tsx
index a4cfa857..30417ad4 100644
--- a/packages/napcat-webui-frontend/src/components/display_card/common_card.tsx
+++ b/packages/napcat-webui-frontend/src/components/display_card/common_card.tsx
@@ -93,7 +93,7 @@ const NetworkDisplayCard = <T extends keyof NetworkType> ({
             onPress={handleEnableDebug}
             isDisabled={editing}
           >
-            {debug ? '关闭调试' : '开启调试'}
+            {debug ? '默认' : '调试'}
           </Button>
           <Button
             fullWidth
diff --git a/packages/napcat-webui-frontend/src/const/ob_api/message/node.ts b/packages/napcat-webui-frontend/src/const/ob_api/message/node.ts
index 1cb4a50a..c1b93c90 100644
--- a/packages/napcat-webui-frontend/src/const/ob_api/message/node.ts
+++ b/packages/napcat-webui-frontend/src/const/ob_api/message/node.ts
@@ -61,7 +61,8 @@ const messageNode = z.union([
     .object({
       type: z.literal('reply'),
       data: z.object({
-        id: z.number(),
+        id: z.number().optional(),
+        seq: z.number().optional(),
       }),
     })
     .describe('回复消息'),
diff --git a/packages/napcat-webui-frontend/src/types/onebot/segment.ts b/packages/napcat-webui-frontend/src/types/onebot/segment.ts
index ae61742b..32f76572 100644
--- a/packages/napcat-webui-frontend/src/types/onebot/segment.ts
+++ b/packages/napcat-webui-frontend/src/types/onebot/segment.ts
@@ -24,196 +24,197 @@ export type OB11SegmentType =
   | 'file';
 
 export interface Segment {
-  type: OB11SegmentType
+  type: OB11SegmentType;
 }
 
 /** 纯文本 */
 export interface TextSegment extends Segment {
-  type: 'text'
+  type: 'text';
   data: {
-    text: string
-  }
+    text: string;
+  };
 }
 
 /** QQ表情 */
 export interface FaceSegment extends Segment {
-  type: 'face'
+  type: 'face';
   data: {
-    id: string
-  }
+    id: string;
+  };
 }
 
 /** 图片消息段 */
 export interface ImageSegment extends Segment {
-  type: 'image'
+  type: 'image';
   data: {
-    file: string
-    type?: 'flash'
-    url?: string
-    cache?: 0 | 1
-    proxy?: 0 | 1
-    timeout?: number
-  }
+    file: string;
+    type?: 'flash';
+    url?: string;
+    cache?: 0 | 1;
+    proxy?: 0 | 1;
+    timeout?: number;
+  };
 }
 
 /** 语音消息段 */
 export interface RecordSegment extends Segment {
-  type: 'record'
+  type: 'record';
   data: {
-    file: string
-    magic?: 0 | 1
-    url?: string
-    cache?: 0 | 1
-    proxy?: 0 | 1
-    timeout?: number
-  }
+    file: string;
+    magic?: 0 | 1;
+    url?: string;
+    cache?: 0 | 1;
+    proxy?: 0 | 1;
+    timeout?: number;
+  };
 }
 
 /** 短视频消息段 */
 export interface VideoSegment extends Segment {
-  type: 'video'
+  type: 'video';
   data: {
-    file: string
-    url?: string
-    cache?: 0 | 1
-    proxy?: 0 | 1
-    timeout?: number
-  }
+    file: string;
+    url?: string;
+    cache?: 0 | 1;
+    proxy?: 0 | 1;
+    timeout?: number;
+  };
 }
 
 /** @某人消息段 */
 export interface AtSegment extends Segment {
-  type: 'at'
+  type: 'at';
   data: {
-    qq: string | 'all'
-    name?: string
-  }
+    qq: string | 'all';
+    name?: string;
+  };
 }
 
 /** 猜拳魔法表情消息段 */
 export interface RpsSegment extends Segment {
-  type: 'rps'
+  type: 'rps';
 }
 
 /** 掷骰子魔法表情消息段 */
 export interface DiceSegment extends Segment {
-  type: 'dice'
+  type: 'dice';
 }
 
 /** 窗口抖动（戳一戳）消息段 */
 export interface ShakeSegment extends Segment {
-  type: 'shake'
-  data: object
+  type: 'shake';
+  data: object;
 }
 
 /** 戳一戳消息段 */
 export interface PokeSegment extends Segment {
-  type: 'poke'
+  type: 'poke';
   data: {
-    type: string
-    id: string
-    name?: string
-  }
+    type: string;
+    id: string;
+    name?: string;
+  };
 }
 
 /** 匿名发消息消息段 */
 export interface AnonymousSegment extends Segment {
-  type: 'anonymous'
+  type: 'anonymous';
   data: {
-    ignore?: 0 | 1
-  }
+    ignore?: 0 | 1;
+  };
 }
 
 /** 链接分享消息段 */
 export interface ShareSegment extends Segment {
-  type: 'share'
+  type: 'share';
   data: {
-    url: string
-    title: string
-    content?: string
-    image?: string
-  }
+    url: string;
+    title: string;
+    content?: string;
+    image?: string;
+  };
 }
 
 /** 推荐好友/群消息段 */
 export interface ContactSegment extends Segment {
-  type: 'contact'
+  type: 'contact';
   data: {
-    type: 'qq' | 'group'
-    id: string
-  }
+    type: 'qq' | 'group';
+    id: string;
+  };
 }
 
 /** 位置消息段 */
 export interface LocationSegment extends Segment {
-  type: 'location'
+  type: 'location';
   data: {
-    lat: string
-    lon: string
-    title?: string
-    content?: string
-  }
+    lat: string;
+    lon: string;
+    title?: string;
+    content?: string;
+  };
 }
 
 /** 音乐分享消息段 */
 export interface MusicSegment extends Segment {
-  type: 'music'
+  type: 'music';
   data: {
-    type: 'qq' | '163' | 'xm'
-    id: string
-  }
+    type: 'qq' | '163' | 'xm';
+    id: string;
+  };
 }
 
 /** 音乐自定义分享消息段 */
 export interface CustomMusicSegment extends Segment {
-  type: 'music'
+  type: 'music';
   data: {
-    type: 'custom'
-    url: string
-    audio: string
-    title: string
-    content?: string
-    image?: string
-  }
+    type: 'custom';
+    url: string;
+    audio: string;
+    title: string;
+    content?: string;
+    image?: string;
+  };
 }
 
 /** 回复消息段 */
 export interface ReplySegment extends Segment {
-  type: 'reply'
+  type: 'reply';
   data: {
-    id: string
-  }
+    id?: string;      // msg_id 的短ID映射
+    seq?: number;     // msg_seq，优先使用
+  };
 }
 
 export interface FileSegment extends Segment {
-  type: 'file'
+  type: 'file';
   data: {
-    file: string
-  }
+    file: string;
+  };
 }
 
 /** 合并转发消息段 */
 export interface ForwardSegment extends Segment {
-  type: 'forward'
+  type: 'forward';
   data: {
-    id: string
-  }
+    id: string;
+  };
 }
 
 /** XML消息段 */
 export interface XmlSegment extends Segment {
-  type: 'xml'
+  type: 'xml';
   data: {
-    data: string
-  }
+    data: string;
+  };
 }
 
 /** JSON消息段 */
 export interface JsonSegment extends Segment {
-  type: 'json'
+  type: 'json';
   data: {
-    data: string
-  }
+    data: string;
+  };
 }
 
 /** OneBot11消息段 */
@@ -242,23 +243,23 @@ export type OB11SegmentBase =
 
 /** 合并转发已有消息节点消息段 */
 export interface DirectNodeSegment extends Segment {
-  type: 'node'
+  type: 'node';
   data: {
-    id: string
-  }
+    id: string;
+  };
 }
 
 /** 合并转发自定义节点消息段 */
 export interface CustomNodeSegments extends Segment {
-  type: 'node'
+  type: 'node';
   data: {
-    user_id: string
-    nickname: string
-    content: OB11Segment[]
-    prompt?: string
-    summary?: string
-    source?: string
-  }
+    user_id: string;
+    nickname: string;
+    content: OB11Segment[];
+    prompt?: string;
+    summary?: string;
+    source?: string;
+  };
 }
 
 /** 合并转发消息段 */