From 74621447ff7ce2544cc79bf9748ea8be4ccf9b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Mon, 3 Jun 2024 17:12:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E9=AB=98=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/onebot11/action/group/SetGroupAddRequest.ts | 2 +-
 src/onebot11/action/group/SetGroupAdmin.ts      | 4 ++--
 src/onebot11/action/group/SetGroupWholeBan.ts   | 6 +++---
 src/onebot11/action/user/SetFriendAddRequest.ts | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

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<Payload, null> {
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
     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<typeof SchemaData>;
@@ -23,7 +23,7 @@ export default class SetGroupAdmin extends BaseAction<Payload, null> {
   protected async _handle(payload: Payload): Promise<null> {
     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<typeof SchemaData>;
@@ -18,7 +18,7 @@ export default class SetGroupWholeBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupWholeBan;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    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<typeof SchemaData>;
@@ -20,7 +20,7 @@ export default class SetFriendAddRequest extends BaseAction<Payload, null> {
   actionName = ActionName.SetFriendAddRequest;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    const approve = payload.approve.toString() === 'true';
+    const approve = payload.approve?.toString() !== 'false';
     const request = friendRequests[payload.flag];
     await NTQQFriendApi.handleFriendRequest(request, approve);
     return null;