Stop preemptively generating screenshots for video stories

ts/sql/Client.ts

@@ -191,6 +191,30 @@ export function _cleanMessageData(data: MessageType): MessageType {
         return omit(attachment, ['data']);
       }
 
+      if (attachment.screenshotData) {
+        assertDev(
+          false,
+          `_cleanMessageData/${logId}: Attachment ${index} had screenshotData field; deleting`
+        );
+        return omit(attachment, ['screenshotData']);
+      }
+
+      if (attachment.screenshot?.data) {
+        assertDev(
+          false,
+          `_cleanMessageData/${logId}: Attachment ${index} had screenshot.data field; deleting`
+        );
+        return omit(attachment, ['screenshot.data']);
+      }
+
+      if (attachment.thumbnail?.data) {
+        assertDev(
+          false,
+          `_cleanMessageData/${logId}: Attachment ${index} had thumbnail.data field; deleting`
+        );
+        return omit(attachment, ['thumbnail.data']);
+      }
+
       return attachment;
     });
   }

ts/sql/Server.ts

@@ -1918,8 +1918,14 @@ function saveMessageSync(
 
   if (attachments) {
     strictAssert(
-      attachments.every(attachment => !attachment.data),
+      attachments.every(
-      'Attempting to save a hydrated message'
+        attachment =>
+          !attachment.data &&
+          !attachment.screenshotData &&
+          !attachment.screenshot?.data &&
+          !attachment.thumbnail?.data
+      ),
+      'Attempting to save a message with binary attachment data'
     );
   }
 

ts/state/ducks/composer.ts

@@ -1079,7 +1079,9 @@ function processAttachments({
     await Promise.all(
       filesToProcess.map(async file => {
         try {
-          const attachment = await processAttachment(file);
+          const attachment = await processAttachment(file, {
+            generateScreenshot: true,
+          });
           if (!attachment) {
             removeAttachment(conversationId, file.path)(
               dispatch,

ts/types/Attachment.ts

@@ -130,7 +130,6 @@ export type BaseAttachmentDraftType = {
   blurHash?: string;
   contentType: MIME.MIMEType;
   screenshotContentType?: string;
-  screenshotSize?: number;
   size: number;
   flags?: number;
 };

ts/util/handleVideoAttachment.ts

@@ -10,33 +10,39 @@ import type { InMemoryAttachmentDraftType } from '../types/Attachment';
 import { fileToBytes } from './fileToBytes';
 
 export async function handleVideoAttachment(
-  file: File
+  file: File,
+  options?: { generateScreenshot: boolean }
 ): Promise<InMemoryAttachmentDraftType> {
   const objectUrl = URL.createObjectURL(file);
   if (!objectUrl) {
     throw new Error('Failed to create object url for video!');
   }
   try {
-    const screenshotContentType = IMAGE_PNG;
-    const screenshotBlob = await makeVideoScreenshot({
-      objectUrl,
-      contentType: screenshotContentType,
-      logger: log,
-    });
-    const screenshotData = await blobToArrayBuffer(screenshotBlob);
     const data = await fileToBytes(file);
-
+    const attachment: InMemoryAttachmentDraftType = {
-    return {
       contentType: stringToMIMEType(file.type),
       data,
       fileName: file.name,
       path: file.name,
       pending: false,
-      screenshotContentType,
-      screenshotData: new Uint8Array(screenshotData),
-      screenshotSize: screenshotData.byteLength,
       size: data.byteLength,
     };
+
+    if (options?.generateScreenshot) {
+      const screenshotContentType = IMAGE_PNG;
+
+      const screenshotBlob = await makeVideoScreenshot({
+        objectUrl,
+        contentType: screenshotContentType,
+        logger: log,
+      });
+      attachment.screenshotData = new Uint8Array(
+        await blobToArrayBuffer(screenshotBlob)
+      );
+      attachment.screenshotContentType = screenshotContentType;
+    }
+
+    return attachment;
   } finally {
     URL.revokeObjectURL(objectUrl);
   }

ts/util/processAttachment.ts

@@ -22,7 +22,8 @@ import { showToast } from './showToast';
 import { ToastFileSize } from '../components/ToastFileSize';
 
 export async function processAttachment(
-  file: File
+  file: File,
+  options?: { generateScreenshot: boolean }
 ): Promise<InMemoryAttachmentDraftType | void> {
   const fileType = stringToMIMEType(file.type);
 
@@ -31,7 +32,7 @@ export async function processAttachment(
     if (isImageTypeSupported(fileType) || isHeic(fileType, file.name)) {
       attachment = await handleImageAttachment(file);
     } else if (isVideoTypeSupported(fileType)) {
-      attachment = await handleVideoAttachment(file);
+      attachment = await handleVideoAttachment(file, options);
     } else {
       const data = await fileToBytes(file);
       attachment = {