Fix uncaught error in copyStickerToAttachments

signalapp · Oct 7, 2021 · 0d5ef38 · 0d5ef38
1 parent 0f92426
commit 0d5ef38
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git 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
@@ -2222,7 +2222,7 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     }
 
     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
@@ -303,7 +303,14 @@ declare global {
         writeNewAttachmentData: (data: Uint8Array) => Promise<string>;
         deleteExternalMessageFiles: (attributes: unknown) => Promise<void>;
         getAbsoluteAttachmentPath: (path: string) => string;
-        loadAttachmentData: (attachment: WhatIsThis) => WhatIsThis;
+        loadAttachmentData: <T extends { path?: string }>(
+          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<DownloadedAttachmentType>;
 
-        copyIntoTempDirectory: any;
+        copyIntoTempDirectory: (
+          path: string
+        ) => Promise<{ path: string; size: number }>;
         deleteDraftFile: (path: string) => Promise<void>;
         deleteTempFile: (path: string) => Promise<void>;
         getAbsoluteDraftPath: any;