fix: 提高兼容性

NapNeko · Jun 3, 2024 · 7462144 · 7462144
1 parent 3280952
commit 7462144
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;