Merge pull request #1661 from session-foundation/fix-fs-changes-qa-2

fix: qa issues for fileserver changes 2

Author: Bilb

ts/models/message.ts

@@ -826,6 +826,13 @@ export class MessageModel extends Model<MessageAttributes> {
       }ms. Attachments: ${attachments.map(m => m.url)}`
     );
 
+    this.setAttachments(
+      this.getAttachments()?.map((a: any, index: number) => ({ ...a, url: attachments[index].url }))
+    );
+    // Note: we don't care about the fileUrl/fileId of previews, only of attachments as they are displayed in the message info
+
+    await this.commit();
+
     return {
       body,
       attachments,

ts/session/utils/job_runners/jobs/AvatarReuploadJob.ts

@@ -233,6 +233,12 @@ class AvatarReuploadJob extends PersistedJob<AvatarReuploadPersistedData> {
         ourConvo: conversation,
         context: 'reuploadAvatar',
       });
+      if (!details?.avatarPointer) {
+        window.log.warn(
+          `[avatarReupload] failed to reupload avatar for ${ed25519Str(conversation.id)}`
+        );
+        throw new Error('details.avatarPointer is not valid after uploadAndSetOurAvatarShared');
+      }
       window.log.info(
         `[avatarReupload] reupload done for ${ed25519Str(conversation.id)}: ${details?.avatarPointer}`
       );

ts/types/attachments/VisualAttachment.ts

@@ -238,7 +238,9 @@ export async function pickFileForAvatar(): Promise<ProcessedAvatarDataType | nul
   } catch (e) {
     ToastUtils.pushToastError(
       'pickFileForAvatar',
-      `An error happened while picking/resizing the image: "${e.message?.slice(200) || ''}"`
+      `An error happened while picking/resizing the image: "${
+        e.message.slice(0, e.message.indexOf('\n')).slice(0, 200) || ''
+      }"`
     );
     window.log.error(e);
     return null;

ts/util/avatar/processAvatarData.ts

@@ -38,7 +38,7 @@ export async function processAvatarData(arrayBuffer: ArrayBuffer, planForReuploa
   // sanity check the returned data
   if (mainAvatarDetails.format !== 'webp' && mainAvatarDetails.format !== 'gif') {
     throw new Error(
-      'processLocalAvatarChange: we only support animated mainAvatarDetails in webp after conversion'
+      'processLocalAvatarChange: we only support animated mainAvatarDetails in webp or gif after conversion'
     );
   }
 
@@ -56,9 +56,7 @@ export async function processAvatarData(arrayBuffer: ArrayBuffer, planForReuploa
   }
 
   if (mainAvatarDetails.size >= MAX_ATTACHMENT_FILESIZE_BYTES) {
-    throw new Error(
-      'processLocalAvatarChange: mainAvatarDetails size is too big after conversion (bigger than fs limit'
-    );
+    throw new Error('Provided image is too big after conversion. Please use another image.');
   }
 
   return { mainAvatarDetails, avatarFallback };

ts/webworker/worker_interface.ts

@@ -43,12 +43,10 @@ export class WorkerInterface {
       const { resolve, reject, fnName } = job;
 
       if (errorForDisplay) {
-        // eslint:disable: no-console
-
         window?.log?.error(`Error received from worker job ${jobId} (${fnName}):`, errorForDisplay);
-        return reject(
-          new Error(`Error received from worker job ${jobId} (${fnName}): ${errorForDisplay}`)
-        );
+        // Note: don't wrap this with a prefix as we want to be able to show what was the error as is to the user in a toast.
+        // If you want to add something, add it at the end.
+        return reject(new Error(errorForDisplay));
       }
 
       return resolve(result);

ts/webworker/workers/node/image_processor/image_processor.d.ts

@@ -44,7 +44,8 @@ export type ProcessedLinkPreviewThumbnailType = NonNullable<
 export type ImageProcessorWorkerActions = {
   /**
    * Process an avatar. Depending on if we want this to be reuploaded or not, we allow gif as a return format or not.
-   * The reason is that when we plan for reupload, we don't convert gif to webp, as we want to keep the original gif.
+   * The reason is that when we plan for reupload, we don't **always** convert gif to webp, as we might want to keep it as gif.
+   * We will try to convert an input gif to webp, but if it takes too long or the resulting file size is too big, we will just use the original gif.
    * When the change is not planned for reupload, we convert everything to a webp.
    * This function will generate a mainAvatar, and a fallbackAvatar if needed.
    *