Add invitor_id field to group request events per OneBot 11 standard

Co-authored-by: sj817 <74231782+sj817@users.noreply.github.com>

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.9.26",
+  "version": "4.9.27",
   "scripts": {
     "build:universal": "npm run build:webui && npm run dev:universal || exit 1",
     "build:framework": "npm run build:webui && npm run dev:framework || exit 1",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.9.26';
+export const napCatVersion = '4.9.27';

src/onebot/api/msg.ts

@@ -1434,7 +1434,8 @@ export class OneBotMsgApi {
         +await this.core.apis.UserApi.getUinByUidV2(groupInvite.invitorUid),
         'invite',
         '',
-        request_seq
+        request_seq,
+        +await this.core.apis.UserApi.getUinByUidV2(groupInvite.invitorUid)
       );
     } 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/request/OB11GroupRequest.ts

@@ -9,13 +9,15 @@ export class OB11GroupRequestEvent extends OB11BaseRequestEvent {
   comment: string;
   flag: string;
   sub_type: string;
+  invitor_id?: number;
 
-  constructor (core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string) {
+  constructor (core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string, invitorId?: number) {
     super(core);
     this.group_id = groupId;
     this.user_id = userId;
     this.sub_type = sub_type;
     this.comment = comment;
     this.flag = flag;
+    this.invitor_id = invitorId;
   }
 }

src/onebot/index.ts

@@ -466,13 +466,15 @@ export class NapCatOneBot11Adapter {
             notify.status === GroupNotifyMsgStatus.KUNHANDLE
           ) {
             this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
+            const inviterUin = +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid);
             const groupInviteEvent = new OB11GroupRequestEvent(
               this.core,
               +notify.group.groupCode,
-              +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid),
+              inviterUin,
               'invite',
               notify.postscript,
-              flag
+              flag,
+              inviterUin
             );
             this.networkManager
               .emitEvent(groupInviteEvent)
@@ -488,9 +490,10 @@ export class NapCatOneBot11Adapter {
               this.core,
               +notify.group.groupCode,
               +await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid),
-              'add',
+              'invite',
               notify.postscript,
-              flag
+              flag,
+              +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid)
             );
             this.networkManager
               .emitEvent(groupInviteEvent)