diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index a710c09e..05431058 100644 --- a/src/onebot/api/msg.ts +++ b/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); diff --git a/src/onebot/event/request/OB11GroupRequest.ts b/src/onebot/event/request/OB11GroupRequest.ts index 968e1d4d..10ceb92a 100644 --- a/src/onebot/event/request/OB11GroupRequest.ts +++ b/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; } } diff --git a/src/onebot/index.ts b/src/onebot/index.ts index bbbd4c6a..17de15d2 100644 --- a/src/onebot/index.ts +++ b/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)