diff --git a/src/onebot11/action/group/SetGroupAddRequest.ts b/src/onebot11/action/group/SetGroupAddRequest.ts index bce72a141..f07aa2fe6 100644 --- a/src/onebot11/action/group/SetGroupAddRequest.ts +++ b/src/onebot11/action/group/SetGroupAddRequest.ts @@ -22,7 +22,7 @@ export default class SetGroupAddRequest extends BaseAction { PayloadSchema = SchemaData; protected async _handle(payload: Payload): Promise { const flag = payload.flag.toString(); - const approve = payload.approve?.toString() === 'true'; + const approve = payload.approve?.toString() !== 'false'; const notify = groupNotifies[flag]; if (!notify) { throw `${flag}对应的加群通知不存在`; diff --git a/src/onebot11/action/group/SetGroupAdmin.ts b/src/onebot11/action/group/SetGroupAdmin.ts index 56242ed0e..42701b622 100644 --- a/src/onebot11/action/group/SetGroupAdmin.ts +++ b/src/onebot11/action/group/SetGroupAdmin.ts @@ -12,7 +12,7 @@ const SchemaData = { user_id: { type: [ 'number' , 'string' ] }, enable: { type: 'boolean' } }, - required: ['group_id', 'user_id', 'enable'] + required: ['group_id', 'user_id'] } as const satisfies JSONSchema; type Payload = FromSchema; @@ -23,7 +23,7 @@ export default class SetGroupAdmin extends BaseAction { protected async _handle(payload: Payload): Promise { const member = await getGroupMember(payload.group_id, payload.user_id); // 已经前置验证类型 - const enable = payload.enable.toString() === 'true'; + const enable = payload.enable?.toString() !== 'false'; if (!member) { throw `群成员${payload.user_id}不存在`; } diff --git a/src/onebot11/action/group/SetGroupWholeBan.ts b/src/onebot11/action/group/SetGroupWholeBan.ts index 6d30c9881..38b4ffc74 100644 --- a/src/onebot11/action/group/SetGroupWholeBan.ts +++ b/src/onebot11/action/group/SetGroupWholeBan.ts @@ -7,9 +7,9 @@ const SchemaData = { type: 'object', properties: { group_id: { type: [ 'number' , 'string' ] }, - enable: { type: 'boolean' } + enable: { type: ['boolean','string'] } }, - required: ['group_id', 'enable'] + required: ['group_id'] } as const satisfies JSONSchema; type Payload = FromSchema; @@ -18,7 +18,7 @@ export default class SetGroupWholeBan extends BaseAction { actionName = ActionName.SetGroupWholeBan; PayloadSchema = SchemaData; protected async _handle(payload: Payload): Promise { - const enable = payload.enable.toString() === 'true'; + const enable = payload.enable?.toString() !== 'false'; await NTQQGroupApi.banGroup(payload.group_id.toString(), enable); return null; } diff --git a/src/onebot11/action/user/SetFriendAddRequest.ts b/src/onebot11/action/user/SetFriendAddRequest.ts index 3a5375a1a..61b66a793 100644 --- a/src/onebot11/action/user/SetFriendAddRequest.ts +++ b/src/onebot11/action/user/SetFriendAddRequest.ts @@ -11,7 +11,7 @@ const SchemaData = { approve: { type: ['string', 'boolean'] }, remark: { type: 'string' } }, - required: ['flag', 'approve'] + required: ['flag'] } as const satisfies JSONSchema; type Payload = FromSchema; @@ -20,7 +20,7 @@ export default class SetFriendAddRequest extends BaseAction { actionName = ActionName.SetFriendAddRequest; PayloadSchema = SchemaData; protected async _handle(payload: Payload): Promise { - const approve = payload.approve.toString() === 'true'; + const approve = payload.approve?.toString() !== 'false'; const request = friendRequests[payload.flag]; await NTQQFriendApi.handleFriendRequest(request, approve); return null;