From c3f3d12f83062e02c2ec5a56fed214c923776bcd 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: Sat, 18 May 2024 13:35:57 +0800
Subject: [PATCH] build: 1.3.5-beta33

---
 src/onebot11/action/go-cqhttp/DownloadFile.ts | 19 ++++---------------
 src/onebot11/action/group/GetGroupList.ts     |  4 ++--
 .../action/group/GetGroupMemberInfo.ts        |  2 +-
 .../action/group/GetGroupMemberList.ts        |  4 ++--
 src/onebot11/action/user/GetFriendList.ts     |  4 ++--
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/onebot11/action/go-cqhttp/DownloadFile.ts b/src/onebot11/action/go-cqhttp/DownloadFile.ts
index c4a0cbe8..3276d0c6 100644
--- a/src/onebot11/action/go-cqhttp/DownloadFile.ts
+++ b/src/onebot11/action/go-cqhttp/DownloadFile.ts
@@ -9,7 +9,7 @@ import Ajv from 'ajv';
 interface FileResponse {
   file: string;
 }
-const PayloadSchema = {
+const SchemaData = {
   type: 'object',
   properties: {
     thread_count: { type: 'number' },
@@ -17,7 +17,7 @@ const PayloadSchema = {
     base64: { type: 'string' },
     name: { type: 'string' },
     headers: {
-      type: "array",
+      type: ["string", "array"],
       items: {
         type: "string"
       }
@@ -25,22 +25,11 @@ const PayloadSchema = {
   },
 } as const satisfies JSONSchema;
 
-type Payload = FromSchema<typeof PayloadSchema>;
+type Payload = FromSchema<typeof SchemaData>;
 
 export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile;
-  validateDownload = new Ajv().compile(PayloadSchema);
-  // 这里重写是为了兼容 headers可能出现 string string[]
-  protected async check(payload: Payload): Promise<BaseCheckResult> {
-    if (payload.headers) {
-      // 如果存在headers 为数组则开始兼容string string[]
-      payload.headers = payload?.headers && Array.isArray(payload.headers) ? payload.headers : [payload.headers as unknown as string];
-    }
-    if (!this.validateDownload(payload)) {
-      return { valid: false, message: this.validateDownload.errors?.map(e => e.message).join(', ') as string };
-    }
-    return { valid: true };
-  }
+  PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<FileResponse> {
     const isRandomName = !payload.name;
     const name = payload.name || uuid4();
diff --git a/src/onebot11/action/group/GetGroupList.ts b/src/onebot11/action/group/GetGroupList.ts
index 8a1eefd5..246447bc 100644
--- a/src/onebot11/action/group/GetGroupList.ts
+++ b/src/onebot11/action/group/GetGroupList.ts
@@ -11,7 +11,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
   type: 'object',
   properties: {
-    no_cache: { type: 'boolean' },
+    no_cache: { type: ['boolean', 'string'] },
   }
 } as const satisfies JSONSchema;
 
@@ -22,7 +22,7 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
     let groupList: Group[] = Array.from(groups.values());
-    if (groupList.length === 0 || payload?.no_cache === true /*|| payload.no_cache === 'true'*/) {
+    if (groupList.length === 0 || payload?.no_cache === true || payload.no_cache === 'true') {
       groupList = await NTQQGroupApi.getGroups(true);
       // log('get groups', groups);
     }
diff --git a/src/onebot11/action/group/GetGroupMemberInfo.ts b/src/onebot11/action/group/GetGroupMemberInfo.ts
index 9a68cdb0..13e4acda 100644
--- a/src/onebot11/action/group/GetGroupMemberInfo.ts
+++ b/src/onebot11/action/group/GetGroupMemberInfo.ts
@@ -16,7 +16,7 @@ const SchemaData = {
   properties: {
     group_id: { type: 'number' },
     user_id: { type: 'number' },
-    no_cache: { type: 'boolean' },
+    no_cache: { type: ['boolean', 'string'] },
   },
   required: ['group_id', 'user_id']
 } as const satisfies JSONSchema;
diff --git a/src/onebot11/action/group/GetGroupMemberList.ts b/src/onebot11/action/group/GetGroupMemberList.ts
index 8d5d47aa..54008767 100644
--- a/src/onebot11/action/group/GetGroupMemberList.ts
+++ b/src/onebot11/action/group/GetGroupMemberList.ts
@@ -11,7 +11,7 @@ const SchemaData = {
   type: 'object',
   properties: {
     group_id: { type: 'number' },
-    no_cache: { type: 'boolean' },
+    no_cache: { type: ['boolean', 'string'] },
   },
   required: ['group_id', 'user_id']
 } as const satisfies JSONSchema;
@@ -28,7 +28,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
     if (!group) {
       throw (`群${payload.group_id}不存在`);
     }
-    if (payload.no_cache == true /*|| payload.no_cache === 'true'*/) {
+    if (payload.no_cache == true || payload.no_cache === 'true') {
       // webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
       const _groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
       groupMembers.set(group.groupCode, _groupMembers);
diff --git a/src/onebot11/action/user/GetFriendList.ts b/src/onebot11/action/user/GetFriendList.ts
index 140f926c..4cd9acd2 100644
--- a/src/onebot11/action/user/GetFriendList.ts
+++ b/src/onebot11/action/user/GetFriendList.ts
@@ -11,7 +11,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
   type: 'object',
   properties: {
-    no_cache: { type: 'boolean' },
+    no_cache: { type: ['boolean', 'string'] },
   }
 } as const satisfies JSONSchema;
 
@@ -20,7 +20,7 @@ export default class GetFriendList extends BaseAction<Payload, OB11User[]> {
   actionName = ActionName.GetFriendList;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    if (friends.size === 0 || payload?.no_cache === true /*|| payload?.no_cache === 'true'*/) {
+    if (friends.size === 0 || payload?.no_cache === true || payload?.no_cache === 'true') {
       const _friends = await NTQQFriendApi.getFriends(true);
       // log('强制刷新好友列表，结果: ', _friends)
       if (_friends.length > 0) {