fix: #334

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.2.36",
+  "version": "2.2.41",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.2.36",
+  "version": "2.2.41",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.2.36';
+export const napCatVersion = '2.2.41';

src/core/apis/group.ts

@@ -121,51 +121,6 @@ export class NTQQGroupApi {
         return group;
     }
 
-    async getGroupMemberLatestSendTimeCache(GroupCode: string, uids: string[]) {
-        return this.getGroupMemberLatestSendTime(GroupCode, uids);
-    }
-
-    async getGroupMemberLatestSendTime(GroupCode: string, uids: string[]) {
-        const getData = async (uid: string) => {
-            const msgListWrapper = await this.getLatestMsgByUids(GroupCode, [uid]);
-            if (msgListWrapper.result !== 0 && msgListWrapper.msgList.length < 1) {
-                return undefined;
-            }
-            return { sendUin: msgListWrapper.msgList[0].senderUin, sendTime: msgListWrapper.msgList[0].msgTime };
-        };
-        const PromiseData: Promise<({
-            sendUin: string;
-            sendTime: string;
-        } | undefined)>[] = [];
-        const ret: Map<string, string> = new Map();
-        for (const uid of uids) {
-            PromiseData.push(getData(uid).catch(() => undefined));
-        }
-        const allRet = await runAllWithTimeout(PromiseData, 2500);
-        for (const PromiseDo of allRet) {
-            if (PromiseDo) {
-                ret.set(PromiseDo.sendUin, PromiseDo.sendTime);
-            }
-        }
-        return ret;
-    }
-
-    async getLatestMsgByUids(GroupCode: string, uids: string[]) {
-        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: {
-                peerUid: GroupCode,
-                chatType: ChatType.KCHATTYPEGROUP,
-            },
-            filterMsgType: [],
-            filterSendersUid: uids,
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: false,
-            isIncludeCurrent: true,
-            pageLimit: 1,
-        });
-    }
-
     async getGroupMemberAll(GroupCode: string, forced = false) {
         return this.context.session.getGroupService().getAllMemberList(GroupCode, forced);
     }
@@ -202,30 +157,6 @@ export class NTQQGroupApi {
         }
         return member;
     }
-
-    async getLatestMsg(GroupCode: string, uins: string[]) {
-        const uids: Array<string> = [];
-        for (const uin of uins) {
-            const uid = await this.core.apis.UserApi.getUidByUinV2(uin);
-            if (uid) {
-                uids.push(uid);
-            }
-        }
-        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: {
-                peerUid: GroupCode,
-                chatType: ChatType.KCHATTYPEGROUP,
-            },
-            filterMsgType: [],
-            filterSendersUid: uids,
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: false,
-            isIncludeCurrent: true,
-            pageLimit: 1,
-        });
-    }
-
     async getGroupRecommendContactArkJson(GroupCode: string) {
         return this.context.session.getGroupService().getGroupRecommendContactArkJson(GroupCode);
     }

src/core/apis/msg.ts

@@ -54,19 +54,6 @@ export class NTQQMsgApi {
         return this.context.session.getMsgService().forwardMsg(msgIds, peer, [peer], new Map());
     }
 
-    async getLatestMsgByUids(peer: Peer, count: number = 20, isReverseOrder: boolean = false) {
-        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: peer,
-            filterMsgType: [],
-            filterSendersUid: [],
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: isReverseOrder,//此参数有点离谱 注意不是本次查询的排序 而是全部消历史信息的排序 默认false 从新消息拉取到旧消息
-            isIncludeCurrent: true,
-            pageLimit: count,
-        });
-    }
-
     async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
         if (!peer) throw new Error('peer is not allowed');
         if (!msgIds) throw new Error('msgIds is not allowed');
@@ -94,11 +81,41 @@ export class NTQQMsgApi {
             pageLimit: 1,
         });
     }
-
+    async queryMsgsWithFilterExWithSeqV2(peer: Peer, msgSeq: string, MsgTime: string, SendersUid: string[]) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: MsgTime,
+            filterMsgFromTime: MsgTime,
+            isReverseOrder: false,
+            isIncludeCurrent: true,
+            pageLimit: 1,
+        });
+    }
+    async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: [],
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 1,
+        });
+    }
     async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
         return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
     }
-
+    async getMsgBySeqList(peer: Peer, msgSeqList: string[]) {
+        //坏的
+        return await this.context.session.getMsgService().getMsgsBySeqList(peer, msgSeqList);
+    }
+    async getMsgBySeqExFirstMsg(peer: Peer, rootMsgId: string, replyMsgId: string) {
+        let reply = await this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, rootMsgId, replyMsgId);
+        console.log(reply);
+    }
     async getMsgExBySeq(peer: Peer, msgSeq: string) {
         const DateNow = Math.floor(Date.now() / 1000);
         const filterMsgFromTime = (DateNow - 300).toString();
@@ -233,7 +250,7 @@ export class NTQQMsgApi {
             () => true,
             (msgRecords) => msgRecords.some(
                 msgRecord => msgRecord.peerUid === destPeer.peerUid
-                && msgRecord.senderUid === this.core.selfInfo.uid
+                    && msgRecord.senderUid === this.core.selfInfo.uid
             ),
         );
         for (const msg of msgList) {

src/core/entities/msg.ts

@@ -370,7 +370,8 @@ export interface ReplyElement {
     replayMsgSeq: string;
     replayMsgId: string;
     senderUin: string;
-    senderUinStr: string;
+    senderUidStr?: string;
+    replyMsgTime?: string;
 }
 
 export interface SendReplyElement {

src/onebot/action/msg/DeleteMsg.ts

@@ -28,18 +28,14 @@ class DeleteMsg extends BaseAction<Payload, void> {
             const ret = this.core.eventWrapper.registerListen(
                 'NodeIKernelMsgListener/onMsgInfoListUpdate',
                 1,
-                5000,
+                1000,
                 (msgs) => !!msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0'),
-            ).catch(() => new Promise<undefined>((resolve) => {
+            ).catch(() => undefined);
-                resolve(undefined);
-            }));
             await this.core.apis.MsgApi.recallMsg(msg.Peer, [msg.MsgId]);
             const data = await ret;
-            if (!data) {
+            if (!data) throw new Error('Recall failed');
-                //throw new Error('Recall failed');
+        } else {
-            }
+            throw new Error('Recall failed');
-            //await sleep(100);
-            //await NTQQMsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId]);
         }
     }
 }

src/onebot/api/group.ts

@@ -271,14 +271,11 @@ export class OneBotGroupApi {
             guildId: '',
             peerUid: groupCode,
         };
-        const replyMsgList = (await this.core.apis.MsgApi.getMsgExBySeq(peer, msgSeq)).msgList;
+        const replyMsgList = (await this.core.apis.MsgApi.queryFirstMsgBySeq(peer, msgSeq)).msgList;
         if (replyMsgList.length < 1) {
             return;
         }
-        const replyMsg = replyMsgList
+        const replyMsg = replyMsgList[0];
-            .filter(e => e.msgSeq == msgSeq)
-            .sort((a, b) => parseInt(a.msgTime) - parseInt(b.msgTime))[0];
-        //console.log("表情回应消息长度检测", msgSeq, replyMsg.elements);
         if (!replyMsg) {
             this.core.context.logger.logError('解析表情回应消息失败: 未找到回应消息');
             return undefined;

src/onebot/api/msg.ts

@@ -219,7 +219,7 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
-            if (!records) {
+            if (!records || !element.replyMsgTime || !element.senderUidStr) {
                 this.core.context.logger.logError('获取不到引用的消息', element.replayMsgSeq);
                 return null;
             }
@@ -234,29 +234,13 @@ export class OneBotMsgApi {
             if (records.peerUin === '284840486') {
                 return createReplyData(records.msgId);
             }
-
+            let replyMsg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, element.replyMsgTime, [element.senderUidStr]))
-            let replyMsg: RawMessage | undefined;
+                .msgList.find(msg => msg.msgRandom === records.msgRandom);
-            // Attempt 1
-            replyMsg = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(peer,element.replayMsgSeq, 1, true, true))
-                .msgList
-                .find(msg => msg.msgRandom === records.msgRandom);
 
             if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
-                // Attempt 2
+                this.core.context.logger.logError('获取不到引用的消息', element.replayMsgSeq);
-                replyMsg = (await this.core.apis.MsgApi.getSingleMsg(peer, element.replayMsgSeq)).msgList[0];
+                return null;
-
-                if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
-                    // Attempt 3
-                    const replyMsgList = (await this.core.apis.MsgApi.getMsgExBySeq(peer, records.msgSeq)).msgList;
-                    if (replyMsgList.length < 1) {
-                        this.core.context.logger.logError('回复消息消息验证失败', element.replayMsgSeq);
-                        return null;
-                    }
-                    replyMsg = replyMsgList.filter(e => e.msgSeq == records.msgSeq)
-                        .sort((a, b) => parseInt(a.msgTime) - parseInt(b.msgTime))[0];
-                }
             }
-
             return createReplyData(replyMsg.msgId);
         },
 
@@ -725,6 +709,9 @@ export class OneBotMsgApi {
             message_format: messagePostFormat === 'string' ? 'string' : 'array',
             post_type: this.core.selfInfo.uin == msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
         };
+        if (this.core.selfInfo.uin == msg.senderUin) {
+            resMsg.message_sent_type = 'self';
+        }
         if (msg.chatType == ChatType.KCHATTYPEGROUP) {
             resMsg.sub_type = 'normal'; // 这里go-cqhttp是group，而onebot11标准是normal, 蛋疼
             resMsg.group_id = parseInt(msg.peerUin);

src/onebot/index.ts

@@ -242,31 +242,31 @@ export class NapCatOneBot11Adapter {
         const msgListener = new NodeIKernelMsgListener();
 
         msgListener.onRecvSysMsg = async msg => {
-            const sysMsg = SysMessage.fromBinary(Uint8Array.from(msg));
+            // const sysMsg = SysMessage.fromBinary(Uint8Array.from(msg));
-            if (sysMsg.msgSpec.length === 0) {
+            // if (sysMsg.msgSpec.length === 0) {
-                return;
+            //     return;
-            }
+            // }
-            const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
+            // const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
-            if (msgType === 732 && subType === 16 && subSubType === 16) {
+            // if (msgType === 732 && subType === 16 && subSubType === 16) {
-                const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));
+            //     const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));
-                if (greyTip.subTypeId === 36) {
+            //     if (greyTip.subTypeId === 36) {
-                    const emojiLikeToOthers = EmojiLikeToOthersWrapper1
+            //         const emojiLikeToOthers = EmojiLikeToOthersWrapper1
-                        .fromBinary(greyTip.rest)
+            //             .fromBinary(greyTip.rest)
-                        .wrapper!
+            //             .wrapper!
-                        .body!;
+            //             .body!;
-                    if (emojiLikeToOthers.attributes?.operation !== 1) { // Un-like
+            //         if (emojiLikeToOthers.attributes?.operation !== 1) { // Un-like
-                        return;
+            //             return;
-                    }
+            //         }
-                    const eventOrEmpty = await this.apis.GroupApi.createGroupEmojiLikeEvent(
+            //         const eventOrEmpty = await this.apis.GroupApi.createGroupEmojiLikeEvent(
-                        greyTip.groupCode.toString(),
+            //             greyTip.groupCode.toString(),
-                        await this.core.apis.UserApi.getUinByUidV2(emojiLikeToOthers.attributes!.senderUid),
+            //             await this.core.apis.UserApi.getUinByUidV2(emojiLikeToOthers.attributes!.senderUid),
-                        emojiLikeToOthers.msgSpec!.msgSeq.toString(),
+            //             emojiLikeToOthers.msgSpec!.msgSeq.toString(),
-                        emojiLikeToOthers.attributes!.emojiId,
+            //             emojiLikeToOthers.attributes!.emojiId,
-                    );
+            //         );
-                    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+            //         // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-                    eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
+            //         eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
-                }
+            //     }
-            }
+            // }
         };
 
         msgListener.onInputStatusPush = async data => {

src/onebot/network/active-websocket.ts

@@ -131,23 +131,24 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
     private async handleMessage(message: any) {
         let receiveData: { action: ActionName, params?: any, echo?: any } = { action: ActionName.Unknown, params: {} };
         let echo = undefined;
+
         try {
-            try {
+            receiveData = JSON.parse(message.toString());
-                receiveData = JSON.parse(message.toString());
+            echo = receiveData.echo;
-                echo = receiveData.echo;
+            this.logger.logDebug('[OneBot] [WebSocket Client] 收到正向Websocket消息', receiveData);
-                this.logger.logDebug('[OneBot] [WebSocket Client] 收到正向Websocket消息', receiveData);
-            } catch (e) {
-                this.checkStateAndReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo));
-                return;
-            }
-            receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
-            const retdata = await this.actions.get(receiveData.action)
-                ?.websocketHandle(receiveData.params, echo ?? '');
-            const packet = Object.assign({}, retdata);
-            this.checkStateAndReply<any>(packet);
         } catch (e) {
-            this.logger.logError('[OneBot] [WebSocket Client] 发生错误', e);
+            this.checkStateAndReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo));
-            this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo));
+            return;
         }
+        receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
+        const action = this.actions.get(receiveData.action);
+        if (!action) {
+            this.logger.logError('[OneBot] [WebSocket Client] 发生错误', '不支持的api ' + receiveData.action);
+            this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo));
+            return;
+        }
+        const retdata = await action?.websocketHandle(receiveData.params, echo ?? '');
+        const packet = Object.assign({}, retdata);
+        this.checkStateAndReply<any>(packet);
     }
 }

src/onebot/network/passive-websocket.ts

@@ -146,22 +146,23 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
         let receiveData: { action: ActionName, params?: any, echo?: any } = { action: ActionName.Unknown, params: {} };
         let echo = undefined;
         try {
-            try {
+            receiveData = JSON.parse(message.toString());
-                receiveData = JSON.parse(message.toString());
+            echo = receiveData.echo;
-                echo = receiveData.echo;
+            //this.logger.logDebug('收到正向Websocket消息', receiveData);
-                //this.logger.logDebug('收到正向Websocket消息', receiveData);
-            } catch (e) {
-                this.checkStateAndReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo), wsClient);
-                return;
-            }
-            receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
-            const retdata = await this.actions.get(receiveData.action)?.websocketHandle(receiveData.params, echo ?? '');
-            const packet = Object.assign({}, retdata);
-            this.checkStateAndReply<any>(packet, wsClient);
         } catch (e) {
-            this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo), wsClient);
+            this.checkStateAndReply<any>(OB11Response.error('json解析失败,请检查数据格式', 1400, echo), wsClient);
+            return;
         }
+        receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
+        const action = this.actions.get(receiveData.action);
+        if (!action) {
+            this.logger.logError('[OneBot] [WebSocket Client] 发生错误', '不支持的api ' + receiveData.action);
+            this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo), wsClient);
+            return;
+        }
+        const retdata = await action.websocketHandle(receiveData.params, echo ?? '');
+        const packet = Object.assign({}, retdata);
+        this.checkStateAndReply<any>(packet, wsClient);
     }
-
 }
 

src/onebot/types/message.ts

@@ -8,6 +8,7 @@ export enum OB11MessageType {
 }
 
 export interface OB11Message {
+    message_sent_type?: string;
     target_id?: number;  // 自己发送的消息才有此字段
     self_id?: number,
     time: number,

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.2.36', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.2.41', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.2.36", "napcat-update-button", "secondary")
+          SettingButton("V2.2.41", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([