From dbba6b3ffe08228d3296a456e1ab782fe42e5ad4 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?= Date: Thu, 5 Mar 2026 15:09:58 +0800 Subject: [PATCH] Add protocol fallback to fetch quoted messages When existing lookup methods fail to find a referenced/reply message, try a protocol-level fallback using PacketApi. If PacketApi.packetStatus is available, attempt FetchGroupMessage or FetchC2CMessage by sequence, match by contentHead.sequence, and use contentHead.newId as the message id to build reply data. Log warnings on success/not-found and errors on exceptions. --- packages/napcat-onebot/api/msg.ts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/napcat-onebot/api/msg.ts b/packages/napcat-onebot/api/msg.ts index 57b1dd38..e086bd84 100644 --- a/packages/napcat-onebot/api/msg.ts +++ b/packages/napcat-onebot/api/msg.ts @@ -384,6 +384,26 @@ export class OneBotMsgApi { this.core.context.logger.logError('所有查找方法均失败，获取不到旧客户端的引用消息', element.replayMsgSeq); } + // 协议兜底：尝试通过协议直接获取消息 + if (this.core.apis.PacketApi.packetStatus) { + try { + const msgSeq = +element.replayMsgSeq; + const fetchedMsgs = msg.chatType === ChatType.KCHATTYPEGROUP + ? await this.core.apis.PacketApi.pkt.operation.FetchGroupMessage(+msg.peerUin, msgSeq, msgSeq) + : await this.core.apis.PacketApi.pkt.operation.FetchC2CMessage(msg.peerUid, msgSeq, msgSeq); + + const targetMsg = fetchedMsgs.find(m => (m.contentHead.sequence ?? 0) === msgSeq); + if (targetMsg?.contentHead?.newId) { + const msgId = String(targetMsg.contentHead.newId); + this.core.context.logger.logWarn('通过协议兜底成功获取引用消息', msgId); + return createReplyData(msgId); + } + this.core.context.logger.logWarn('协议兜底未找到匹配的引用消息'); + } catch (e) { + this.core.context.logger.logError('协议兜底获取引用消息失败', (e as Error).stack); + } + } + return null; }, videoElement: async (element, msg, elementWrapper, { disableGetUrl }) => {