GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: get file way 01 get by msg & seq id

Browse Source
This commit is contained in:
Wesley F. Young 2024-08-31 20:30:42 +08:00
parent 3f24461612
commit f1643ac549
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/apis/file.ts
View File

@ -259,7 +259,7 @@ export class NTQQFileApi {
return sourcePath; return sourcePath;
} }
} }
await this.core.eventWrapper.callNormalEventV2( const [, completeRetData] = await this.core.eventWrapper.callNormalEventV2(
'NodeIKernelMsgService/downloadRichMedia', 'NodeIKernelMsgService/downloadRichMedia',
'NodeIKernelMsgListener/onRichMediaDownloadComplete', 'NodeIKernelMsgListener/onRichMediaDownloadComplete',
[{ [{
@ -279,24 +279,7 @@ export class NTQQFileApi {
1, 1,
timeout, timeout,
); );
const mixElement = (await this.core.apis.MsgApi.getMsgsByMsgId({ return completeRetData.filePath;
guildId: '',
chatType: chatType,
peerUid: peerUid,
}, [msgId])).msgList
.find((msg) => msg.msgId === msgId)
?.elements.find((e) => e.elementId === elementId);
const mixElementInner = mixElement?.videoElement
?? mixElement?.fileElement
?? mixElement?.pttElement
?? mixElement?.picElement;
let realPath = mixElementInner?.filePath;
if (!realPath) {
const picThumbPath: Map<number, string> = (mixElementInner as any)?.picThumbPath;
const picThumbPathList = Array.from(picThumbPath.values());
if (picThumbPathList.length > 0) realPath = picThumbPathList[0];
}
return realPath;
} }
async getImageSize(filePath: string): Promise<ISizeCalculationResult> { async getImageSize(filePath: string): Promise<ISizeCalculationResult> {

5
src/onebot/api/msg.ts
View File

@ -106,12 +106,13 @@ export class OneBotMsgApi {
peerUid: msg.peerUid, peerUid: msg.peerUid,
guildId: '', guildId: '',
}; };
const encodedFileId = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId);
return { return {
type: OB11MessageDataType.image, type: OB11MessageDataType.image,
data: { data: {
file: element.fileName, file: encodedFileId,
sub_type: element.picSubType, sub_type: element.picSubType,
file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId), file_id: encodedFileId,
url: await this.core.apis.FileApi.getImageUrl(element), url: await this.core.apis.FileApi.getImageUrl(element),
file_size: element.fileSize, file_size: element.fileSize,
}, },