diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index 9dbad8d9..a51b04f3 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -3,7 +3,7 @@ import { Group, GroupMember, NTGroupMemberRole, - GroupRequestOperateTypes, + NTGroupRequestOperateTypes, InstanceContext, KickMemberV2Req, MemberExtSourceType, @@ -417,7 +417,7 @@ export class NTQQGroupApi { return this.context.session.getGroupService().uploadGroupBulletinPic(GroupCode, _Pskey, imageurl); } - async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) { + async handleGroupRequest(flag: string, operateType: NTGroupRequestOperateTypes, reason?: string) { const flagitem = flag.split('|'); const groupCode = flagitem[0]; const seq = flagitem[1]; diff --git a/src/core/entities/notify.ts b/src/core/entities/notify.ts index f9c7dd64..62e94ffd 100644 --- a/src/core/entities/notify.ts +++ b/src/core/entities/notify.ts @@ -107,9 +107,12 @@ export interface GroupNotify { warningTips: string; } -export enum GroupRequestOperateTypes { - approve = 1, - reject = 2 +export enum NTGroupRequestOperateTypes { + KUNSPECIFIED = 0, + KAGREE = 1, + KREFUSE = 2, + KIGNORE = 3, + KDELETE = 4 } export enum BuddyReqType { diff --git a/src/core/services/NodeIKernelGroupService.ts b/src/core/services/NodeIKernelGroupService.ts index 4c9ee0f1..9f3efc09 100644 --- a/src/core/services/NodeIKernelGroupService.ts +++ b/src/core/services/NodeIKernelGroupService.ts @@ -6,7 +6,7 @@ import { GroupMember, NTGroupMemberRole, GroupNotifyMsgType, - GroupRequestOperateTypes, + NTGroupRequestOperateTypes, KickMemberV2Req, } from '@/core/entities'; import { GeneralCallResult } from '@/core/services/common'; @@ -198,9 +198,9 @@ export interface NodeIKernelGroupService { operateSysNotify( doubt: boolean, operateMsg: { - operateType: GroupRequestOperateTypes, // 2 拒绝 + operateType: NTGroupRequestOperateTypes, targetMsg: { - seq: string, // 通知序列号 + seq: string, type: GroupNotifyMsgType, groupCode: string, postscript: string diff --git a/src/onebot/api/quick-action.ts b/src/onebot/api/quick-action.ts index 6434b26f..e661d9df 100644 --- a/src/onebot/api/quick-action.ts +++ b/src/onebot/api/quick-action.ts @@ -10,7 +10,7 @@ import { QuickActionGroupMessage, QuickActionGroupRequest, } from '@/onebot'; -import { GroupRequestOperateTypes, NapCatCore, Peer } from '@/core'; +import { NTGroupRequestOperateTypes, NapCatCore, Peer } from '@/core'; import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest'; import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest'; import { ContextMode, createContext, normalize } from '@/onebot/action/msg/SendMsg'; @@ -86,7 +86,7 @@ export class OneBotQuickActionApi { if (!isNull(quickAction.approve)) { this.core.apis.GroupApi.handleGroupRequest( request.flag, - quickAction.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject, + quickAction.approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE, quickAction.reason, ).catch(this.core.context.logger.logError.bind(this.core.context.logger)); }