From 23d613321e633efa9868233d79882db6183a4d43 Mon Sep 17 00:00:00 2001 From: Seijo Cecilia Date: Fri, 30 Aug 2024 15:41:50 +0800 Subject: [PATCH] Revert "fix: arg3 no longer needed for downloadFileForModelId" This reverts commit e1e4d038d9ace529102d9dadd82f6cc46caaf9ca. --- src/core/apis/file.ts | 4 ++-- src/core/services/NodeIKernelRichMediaService.ts | 2 +- src/onebot/action/file/GetFile.ts | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index 5efdeca9..d9110ac2 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -302,11 +302,11 @@ export class NTQQFileApi { async downloadMediaByUuid() { //napCatCore.session.getRichMediaService().downloadFileForFileUuid(); } - async downloadFileForModelId(peer: Peer, modelId: string, timeout = 1000 * 60 * 2) { + async downloadFileForModelId(peer: Peer, modelId: string, unknown: string, timeout = 1000 * 60 * 2) { const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2( 'NodeIKernelRichMediaService/downloadFileForModelId', 'NodeIKernelMsgListener/onRichMediaDownloadComplete', - [peer, [modelId]], + [peer, [modelId], unknown], () => true, (arg) => arg?.commonFileInfo?.fileModelId === modelId, 1, diff --git a/src/core/services/NodeIKernelRichMediaService.ts b/src/core/services/NodeIKernelRichMediaService.ts index b49bb896..e4a0afd6 100644 --- a/src/core/services/NodeIKernelRichMediaService.ts +++ b/src/core/services/NodeIKernelRichMediaService.ts @@ -155,7 +155,7 @@ export interface NodeIKernelRichMediaService { }): unknown; //arg3为“” - downloadFileForModelId(peer: Peer, ModelId: string[]): Promise; + downloadFileForModelId(peer: Peer, ModelId: string[], unknown: string): Promise; //第三个参数 Array // this.fileId = ""; diff --git a/src/onebot/action/file/GetFile.ts b/src/onebot/action/file/GetFile.ts index ced880dc..96cec3f7 100644 --- a/src/onebot/action/file/GetFile.ts +++ b/src/onebot/action/file/GetFile.ts @@ -59,12 +59,11 @@ export class GetFileBase extends BaseAction { } return res; } - //群文件模式 const contextModelIdFile = FileNapCatOneBotUUID.decodeModelId(payload.file); if (contextModelIdFile) { const { peer, modelId } = contextModelIdFile; - const downloadPath = await NTQQFileApi.downloadFileForModelId(peer, modelId); + const downloadPath = await NTQQFileApi.downloadFileForModelId(peer, modelId,''); const res: GetFileResponse = { file: downloadPath, url: downloadPath,