From d89620d7a655f029279699d506f6d60f6abf92ce 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: Thu, 12 Sep 2024 19:55:26 +0800
Subject: [PATCH] style: folder

---
 src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts | 7 ++++---
 src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts | 5 +++--
 src/onebot/action/go-cqhttp/UploadGroupFile.ts       | 2 +-
 src/onebot/entities.ts                               | 1 +
 src/onebot/types/entity.ts                           | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts b/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts
index acefd21f..be8dbda5 100644
--- a/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts
+++ b/src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts
@@ -7,17 +7,18 @@ const SchemaData = {
     properties: {
         group_id: { type: ['string', 'number'] },
         folder_id: { type: 'string' },
+        folder: { type: 'string' }
     },
-    required: ['group_id', 'folder_id'],
+    required: ['group_id'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class DeleteGroupFileFolder extends BaseAction<Payload, any>  {
+export class DeleteGroupFileFolder extends BaseAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder;
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {
         return (await this.core.apis.GroupApi.DelGroupFileFolder(
-            payload.group_id.toString(), payload.folder_id)).groupFileCommonResult;
+            payload.group_id.toString(), payload.folder ?? payload.folder_id ?? '')).groupFileCommonResult;
     }
 }
diff --git a/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts b/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts
index 5f9c20f0..15d3f24a 100644
--- a/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts
+++ b/src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts
@@ -8,9 +8,10 @@ const SchemaData = {
     properties: {
         group_id: { type: ['string', 'number'] },
         folder_id: { type: 'string' },
+        folder: { type: 'string' },
         file_count: { type: ['string', 'number'] },
     },
-    required: ['group_id', 'folder_id'],
+    required: ['group_id'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -26,7 +27,7 @@ export class GetGroupFilesByFolder extends BaseAction<any, any> {
             startIndex: 0,
             sortOrder: 2,
             showOnlinedocFolder: 0,
-            folderId: payload.folder_id,
+            folderId: payload.folder ?? payload.folder_id ?? '',
         }).catch(() => []);
         return {
             files: ret.filter(item => item.fileInfo)
diff --git a/src/onebot/action/go-cqhttp/UploadGroupFile.ts b/src/onebot/action/go-cqhttp/UploadGroupFile.ts
index 3fc5005b..79efa989 100644
--- a/src/onebot/action/go-cqhttp/UploadGroupFile.ts
+++ b/src/onebot/action/go-cqhttp/UploadGroupFile.ts
@@ -41,7 +41,7 @@ export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
             peer: peer,
             deleteAfterSentFiles: []
         };
-        const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name, payload.folder_id);
+        const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name, payload.folder ?? payload.folder_id);
         await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [sendFileEle], [], true);
         return null;
     }
diff --git a/src/onebot/entities.ts b/src/onebot/entities.ts
index 12d5f39f..8fea6a51 100644
--- a/src/onebot/entities.ts
+++ b/src/onebot/entities.ts
@@ -126,6 +126,7 @@ export class OB11Entities {
         return {
             group_id: parseInt(peerId),
             folder_id: folder.folderId,
+            folder:folder.folderId,
             folder_name: folder.folderName,
             create_time: folder.createTime,
             creator: parseInt(folder.createUin),
diff --git a/src/onebot/types/entity.ts b/src/onebot/types/entity.ts
index 1356eb90..07355bba 100644
--- a/src/onebot/types/entity.ts
+++ b/src/onebot/types/entity.ts
@@ -81,6 +81,7 @@ export interface OB11GroupFile {
 export interface OB11GroupFileFolder {
     group_id: number,
     folder_id: string,
+    folder: string,
     folder_name: string,
     create_time: number,
     creator: number,