From 1c8e81d8e623c2cb3847d531e85b3b3046d530c5 Mon Sep 17 00:00:00 2001
From: audric <audric@loki.network>
Date: Wed, 12 Jan 2022 18:56:33 +1100
Subject: [PATCH] make sure to store generated thumbnail with the attachment
 message

---
 ts/models/conversation.ts          |  1 +
 ts/models/message.ts               |  1 +
 ts/types/MessageAttachment.ts      |  2 +-
 ts/types/attachments/migrations.ts | 44 ++++++++++++------------------
 ts/util/attachmentsUtil.ts         |  4 +--
 5 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 6b54680ca..e600520a3 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -609,6 +609,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
   public async sendMessageJob(message: MessageModel, expireTimer: number | undefined) {
     try {
+
       const uploads = await message.uploadData();
       const { id } = message;
       const destination = this.id;
diff --git a/ts/models/message.ts b/ts/models/message.ts
index e2f635b7f..ffa18378c 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -746,6 +746,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       quotePromise,
     ]);
     window.log.info(`Upload of message data for message ${this.idForLogging()} is finished.`);
+
     return {
       body,
       attachments,
diff --git a/ts/types/MessageAttachment.ts b/ts/types/MessageAttachment.ts
index 6f1ecd2db..1ea5c10b9 100644
--- a/ts/types/MessageAttachment.ts
+++ b/ts/types/MessageAttachment.ts
@@ -177,7 +177,7 @@ export const processNewAttachment = async (attachment: {
 
   const onDiskAttachmentPath = await migrateDataToFileSystem(rotatedAttachment.data);
 
-  const attachmentWithoutData = omit({ ...attachment, path: onDiskAttachmentPath }, 'data');
+  const attachmentWithoutData = omit({ ...attachment, path: onDiskAttachmentPath }, ['data']);
   const finalAttachment = await captureDimensionsAndScreenshot(attachmentWithoutData);
 
   return { ...finalAttachment, size: rotatedAttachment.data.byteLength };
diff --git a/ts/types/attachments/migrations.ts b/ts/types/attachments/migrations.ts
index e215eec77..8e8cb6e5b 100644
--- a/ts/types/attachments/migrations.ts
+++ b/ts/types/attachments/migrations.ts
@@ -193,33 +193,22 @@ type CaptureDimensionType = { contentType: string; path: string };
 
 export const captureDimensionsAndScreenshot = async (
   attachment: CaptureDimensionType
-): Promise<| CaptureDimensionType
-| (CaptureDimensionType & {
+): Promise<CaptureDimensionType & {
+  width?: number;
+  height?: number;
+  thumbnail: {
+    path: string;
+    contentType: string;
     width: number;
     height: number;
-    thumbnail: {
-      path: string;
-      contentType: string;
-      width: number;
-      height: number;
-    };
-  })
-| (CaptureDimensionType & {
+  } | null;
+  screenshot: {
+    path: string;
+    contentType: string;
     width: number;
     height: number;
-    thumbnail: {
-      path: string;
-      contentType: string;
-      width: number;
-      height: number;
-    };
-    screenshot: {
-      path: string;
-      contentType: string;
-      width: number;
-      height: number;
-    };
-  })> => {
+  } | null;
+}> => {
   const { contentType } = attachment;
 
   if (
@@ -227,12 +216,12 @@ export const captureDimensionsAndScreenshot = async (
     (!GoogleChrome.isImageTypeSupported(contentType) &&
       !GoogleChrome.isVideoTypeSupported(contentType))
   ) {
-    return attachment;
+    return { ...attachment, screenshot: null, thumbnail: null };
   }
 
   // If the attachment hasn't been downloaded yet, we won't have a path
   if (!attachment.path) {
-    return attachment;
+    return { ...attachment, screenshot: null, thumbnail: null };
   }
 
   const absolutePath = getAbsoluteAttachmentPath(attachment.path);
@@ -258,6 +247,7 @@ export const captureDimensionsAndScreenshot = async (
           width: THUMBNAIL_SIDE,
           height: THUMBNAIL_SIDE,
         },
+        screenshot: null,
       };
     } catch (error) {
       window.log.error(
@@ -265,7 +255,7 @@ export const captureDimensionsAndScreenshot = async (
         'error processing image; skipping screenshot generation',
         toLogFormat(error)
       );
-      return attachment;
+      return { ...attachment, screenshot: null, thumbnail: null };
     }
   }
 
@@ -312,7 +302,7 @@ export const captureDimensionsAndScreenshot = async (
       'captureDimensionsAndScreenshot: error processing video; skipping screenshot generation',
       toLogFormat(error)
     );
-    return attachment;
+    return { ...attachment, screenshot: null, thumbnail: null };
   } finally {
     if (screenshotObjectUrl) {
       revokeObjectUrl(screenshotObjectUrl);
diff --git a/ts/util/attachmentsUtil.ts b/ts/util/attachmentsUtil.ts
index 40e700e94..039f8052e 100644
--- a/ts/util/attachmentsUtil.ts
+++ b/ts/util/attachmentsUtil.ts
@@ -237,8 +237,8 @@ export async function getFileAndStoreLocally(
     path: attachmentSavedLocally.path,
     width: scaled.width,
     height: scaled.height,
-    screenshot: null,
-    thumbnail: null,
+    screenshot: attachmentSavedLocally.screenshot,
+    thumbnail: attachmentSavedLocally.thumbnail,
     size: attachmentSavedLocally.size,
 
     // url: undefined,