mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-12-18 20:30:08 +08:00
Add invitor_id field to group request events per OneBot 11 standard
Co-authored-by: sj817 <74231782+sj817@users.noreply.github.com>
This commit is contained in:
parent
79ead4df57
commit
63fdff45e0
@ -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);
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user