diff --git a/ts/types/Stickers.ts b/ts/types/Stickers.ts index b1cff0a26a2..1ee39184e25 100644 --- a/ts/types/Stickers.ts +++ b/ts/types/Stickers.ts @@ -769,7 +769,9 @@ export async function copyStickerToAttachments( size, } = await window.Signal.Migrations.copyIntoAttachmentsDirectory(absolutePath); - const data = window.Signal.Migrations.loadAttachmentData(path); + const { data } = await window.Signal.Migrations.loadAttachmentData({ + path, + }); let contentType: MIMEType; const sniffedMimeType = sniffImageMimeType(data); diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts index 68f64d24570..fe2cb90972e 100644 --- a/ts/views/conversation_view.ts +++ b/ts/views/conversation_view.ts @@ -2222,7 +2222,7 @@ export class ConversationView extends window.Backbone.View { } const absolutePath = getAbsoluteAttachmentPath(firstAttachment.path); - const tempPath = await copyIntoTempDirectory(absolutePath); + const { path: tempPath } = await copyIntoTempDirectory(absolutePath); const tempAttachment = { ...firstAttachment, path: tempPath, diff --git a/ts/window.d.ts b/ts/window.d.ts index 0d49ece328d..effb5f49de7 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -303,7 +303,14 @@ declare global { writeNewAttachmentData: (data: Uint8Array) => Promise; deleteExternalMessageFiles: (attributes: unknown) => Promise; getAbsoluteAttachmentPath: (path: string) => string; - loadAttachmentData: (attachment: WhatIsThis) => WhatIsThis; + loadAttachmentData: ( + attachment: T + ) => Promise< + T & { + data: Uint8Array; + size: number; + } + >; loadQuoteData: (quote: unknown) => WhatIsThis; loadPreviewData: (preview: unknown) => WhatIsThis; loadStickerData: (sticker: unknown) => WhatIsThis; @@ -332,7 +339,9 @@ declare global { attachment: DownloadedAttachmentType ) => Promise; - copyIntoTempDirectory: any; + copyIntoTempDirectory: ( + path: string + ) => Promise<{ path: string; size: number }>; deleteDraftFile: (path: string) => Promise; deleteTempFile: (path: string) => Promise; getAbsoluteDraftPath: any;