From f05a862cf95b85767c7e1ca671fe642dd5730b42 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?= Date: Tue, 13 Aug 2024 22:18:24 +0800 Subject: [PATCH] fix --- src/onebot/action/file/GetFile.ts | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/onebot/action/file/GetFile.ts b/src/onebot/action/file/GetFile.ts index bc25644e..5d5a3cd9 100644 --- a/src/onebot/action/file/GetFile.ts +++ b/src/onebot/action/file/GetFile.ts @@ -28,19 +28,6 @@ const GetFileBase_PayloadSchema = { export class GetFileBase extends BaseAction { PayloadSchema: any = GetFileBase_PayloadSchema; - private getElement(msg: RawMessage): { id: string, element: VideoElement | FileElement } { - let element = msg.elements.find(e => e.fileElement); - if (!element) { - element = msg.elements.find(e => e.videoElement); - if (element) { - return { id: element.elementId, element: element.videoElement }; - } else { - throw new Error('找不到文件'); - } - } - return { id: element.elementId, element: element.fileElement }; - } - async _handle(payload: GetFilePayload): Promise { const NTQQFriendApi = this.CoreContext.apis.FriendApi; const NTQQUserApi = this.CoreContext.apis.UserApi; @@ -92,7 +79,7 @@ export class GetFileBase extends BaseAction { file_size: fileSize, file_name: fileName, }; - if (true/*enableLocalFile2Url*/) { + if (true/*enableLocalFile2Url*/ && downloadPath) { try { res.base64 = await fs.readFile(downloadPath, 'base64'); } catch (e) { @@ -132,7 +119,7 @@ export class GetFileBase extends BaseAction { file_size: NTSearchNameResult[0].fileSize.toString(), file_name: NTSearchNameResult[0].fileName, }; - if (true/*enableLocalFile2Url*/) { + if (true/*enableLocalFile2Url*/ && downloadPath) { try { res.base64 = await fs.readFile(downloadPath, 'base64'); } catch (e) {