fix: 更精确的筛选

see https://github.com/evanw/esbuild/issues/4010

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.36",
+  "version": "4.2.37",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -17,6 +17,7 @@
     "dev:depend": "npm i && cd napcat.webui && npm i"
   },
   "devDependencies": {
+    "esbuild": "0.24.0",
     "@babel/preset-typescript": "^7.24.7",
     "@eslint/compat": "^1.2.2",
     "@eslint/eslintrc": "^3.1.0",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.36';
+export const napCatVersion = '4.2.37';

src/core/packet/transformer/proto/message/message.ts

@@ -72,6 +72,14 @@ export const GroupChange = {
     field7: ProtoField(7, ScalarType.BYTES, true),
 };
 
+export const GroupInvite = {
+    groupUin: ProtoField(1, ScalarType.UINT32),
+    field2: ProtoField(2, ScalarType.UINT32),
+    field3: ProtoField(2, ScalarType.UINT32),
+    field4: ProtoField(2, ScalarType.UINT32),
+    invitorUid: ProtoField(5, ScalarType.STRING),
+};
+
 export const PushMsgBody = {
     responseHead: ProtoField(1, () => ResponseHead),
     contentHead: ProtoField(2, () => ContentHead),

src/core/types/msg.ts

@@ -508,7 +508,7 @@ export interface RawMessage {
  */
 export interface QueryMsgsParams {
     chatInfo: Peer;
-    filterMsgType: [];
+    filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
     filterSendersUid: string[];
     filterMsgFromTime: string;
     filterMsgToTime: string;

src/onebot/api/friend.ts

@@ -12,16 +12,17 @@ export class OneBotFriendApi {
     }
 
     //使用前预先判断 busiId 1061
-    async parsePrivatePokeEvent(grayTipElement: GrayTipElement) {
+    async parsePrivatePokeEvent(grayTipElement: GrayTipElement, uin: number) {
         const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr);
-        let pokedetail: Array<{ uid: string }> = json.items;
+        const pokedetail: Array<{ uid: string }> = json.items;
         //筛选item带有uid的元素
-        pokedetail = pokedetail.filter(item => item.uid);
-        if (pokedetail.length == 2) {
+        const poke_uid = pokedetail.filter(item => item.uid);
+        if (poke_uid.length == 2) {
             return new OB11FriendPokeEvent(
                 this.core,
-                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[0].uid))),
-                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[1].uid))),
+                uin,
+                parseInt((await this.core.apis.UserApi.getUinByUidV2(poke_uid[0].uid))),
+                parseInt((await this.core.apis.UserApi.getUinByUidV2(poke_uid[1].uid))),
                 pokedetail,
             );
         }

src/onebot/api/msg.ts

@@ -33,7 +33,8 @@ import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
 import { OB11GroupDecreaseEvent, GroupDecreaseSubType } from '../event/notice/OB11GroupDecreaseEvent';
 import { GroupAdmin } from '@/core/packet/transformer/proto/message/groupAdmin';
 import { OB11GroupAdminNoticeEvent } from '../event/notice/OB11GroupAdminNoticeEvent';
-import { GroupChange, GroupChangeInfo, PushMsgBody } from '@/core/packet/transformer/proto';
+import { GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody } from '@/core/packet/transformer/proto';
+import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -679,7 +680,7 @@ export class OneBotMsgApi {
     async parsePrivateMsgEvent(msg: RawMessage, grayTipElement: GrayTipElement) {
         if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
             if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement);
+                const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
                 if (PokeEvent) { return PokeEvent; };
             } else if (grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') {
                 return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
@@ -895,16 +896,16 @@ export class OneBotMsgApi {
         const calculateTotalSize = async (elements: SendMessageElement[]): Promise<number> => {
             const sizePromises = elements.map(async element => {
                 switch (element.elementType) {
-                case ElementType.PTT:
-                    return (await fsPromise.stat(element.pttElement.filePath)).size;
-                case ElementType.FILE:
-                    return (await fsPromise.stat(element.fileElement.filePath)).size;
-                case ElementType.VIDEO:
-                    return (await fsPromise.stat(element.videoElement.filePath)).size;
-                case ElementType.PIC:
-                    return (await fsPromise.stat(element.picElement.sourcePath)).size;
-                default:
-                    return 0;
+                    case ElementType.PTT:
+                        return (await fsPromise.stat(element.pttElement.filePath)).size;
+                    case ElementType.FILE:
+                        return (await fsPromise.stat(element.fileElement.filePath)).size;
+                    case ElementType.VIDEO:
+                        return (await fsPromise.stat(element.videoElement.filePath)).size;
+                    case ElementType.PIC:
+                        return (await fsPromise.stat(element.picElement.sourcePath)).size;
+                    default:
+                        return 0;
                 }
             });
             const sizes = await Promise.all(sizePromises);
@@ -970,14 +971,14 @@ export class OneBotMsgApi {
     }
     groupChangDecreseType2String(type: number): GroupDecreaseSubType {
         switch (type) {
-        case 130:
-            return 'leave';
-        case 131:
-            return 'kick';
-        case 3:
-            return 'kick_me';
-        default:
-            return 'kick';
+            case 130:
+                return 'leave';
+            case 131:
+                return 'kick';
+            case 3:
+                return 'kick_me';
+            default:
+                return 'kick';
         }
     }
 
@@ -1033,7 +1034,35 @@ export class OneBotMsgApi {
                 +await this.core.apis.UserApi.getUinByUidV2(uid),
                 enabled ? 'set' : 'unset'
             );
-        } else if (SysMessage.contentHead.type == 528 && SysMessage.contentHead.subType == 39 && SysMessage.body?.msgContent) {
+        } else if (SysMessage.contentHead.type == 87 && SysMessage.body?.msgContent) {
+            let groupInvite = new NapProtoMsg(GroupInvite).decode(SysMessage.body.msgContent);
+            let request_seq = '';
+            await this.core.eventWrapper.registerListen('NodeIKernelMsgListener/onRecvMsg', (msgs) => {
+                for (const msg of msgs) {
+                    if (msg.senderUid === groupInvite.invitorUid && msg.msgType === 11) {
+                        let jumpUrl = JSON.parse(msg.elements.find(e => e.elementType === 10)?.arkElement?.bytesData ?? '').meta?.news?.jumpUrl;
+                        let jumpUrlParams = new URLSearchParams(jumpUrl);
+                        let groupcode = jumpUrlParams.get('groupcode');
+                        let receiveruin = jumpUrlParams.get('receiveruin');
+                        let msgseq = jumpUrlParams.get('msgseq');
+                        request_seq = msgseq ?? '';
+                        if (groupcode === groupInvite.groupUin.toString() && receiveruin === this.core.selfInfo.uin) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }, 1, 1000);
+            return new OB11GroupRequestEvent(
+                this.core,
+                +groupInvite.groupUin,
+                +await this.core.apis.UserApi.getUinByUidV2(groupInvite.invitorUid),
+                'invite',
+                '',
+                request_seq
+            );
+        }
+        else if (SysMessage.contentHead.type == 528 && SysMessage.contentHead.subType == 39 && SysMessage.body?.msgContent) {
             return await this.obContext.apis.UserApi.parseLikeEvent(SysMessage.body?.msgContent);
         }
     }

src/onebot/event/notice/OB11PokeEvent.ts

@@ -10,12 +10,14 @@ class OB11PokeEvent extends OB11BaseNoticeEvent {
 
 export class OB11FriendPokeEvent extends OB11PokeEvent {
     raw_info: any;
+    sender_id: number;
 
     //raw_message nb等框架标准为string
-    constructor(core: NapCatCore, user_id: number, target_id: number, raw_message: any) {
+    constructor(core: NapCatCore, user_id: number, sender_id: number, target_id: number, raw_message: any) {
         super(core);
         this.target_id = target_id;
         this.user_id = user_id;
+        this.sender_id = sender_id;
         this.raw_info = raw_message;
     }
 }

src/onebot/index.ts

@@ -310,7 +310,7 @@ export class NapCatOneBot11Adapter {
                 guildId: ''
             };
             const msg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, msgSeq)).msgList.find(e => e.msgType == NTMsgType.KMSGTYPEGRAYTIPS);
-            const element = msg?.elements[0];
+            const element = msg?.elements.find(e => !!e.grayTipElement?.revokeElement);
             if (msg && element) {
                 const recallEvent = await this.emitRecallMsg(msg, element);
                 try {
@@ -467,6 +467,10 @@ export class NapCatOneBot11Adapter {
     }
 
     private async handleMsg(message: RawMessage, network: Array<AdapterConfigWrap>) {
+        // 过滤无效消息
+        if (message.msgType === NTMsgType.KMSGTYPENULL) {
+            return;
+        }
         try {
             const ob11Msg = await this.apis.MsgApi.parseMessageV2(message, this.configLoader.configData.parseMultMsg);
             if (ob11Msg) {