chore: cleanup PR

Author: Bilb

preload.js

@@ -67,7 +67,8 @@ window.sessionFeatureFlags = {
   showPopoverAnchors: false,
   proAvailable: !isEmpty(process.env.SESSION_PRO),
   mockUserHasPro: !isEmpty(process.env.SESSION_HAS_PRO),
-  fsTTL30s: !isEmpty(process.env.FILE_SERVER_TTL_30S), // Note: some stuff are init when the app start, so this flag should only be set from the env itself.
+  // Note: some stuff are init when the app starts, so fsTTL30s should only be set from the env itself (before app starts)
+  fsTTL30s: !isEmpty(process.env.FILE_SERVER_TTL_30S),
   debug: {
     debugLogging: !isEmpty(process.env.SESSION_DEBUG),
     debugLibsessionDumps: !isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS),

ts/components/conversation/SessionConversation.tsx

@@ -405,14 +405,13 @@ export class SessionConversation extends Component<Props, State> {
       // If we can, we use the scaled version, otherwise we use the original (and the filesize check will fail)
       //
       // Note: we do not save that scaled version here,
-      // we just check if will be fine when sending the attachment.
+      // we just check if it will be fine when sending the attachment.
       // Later, when the message is being sent, we will fetch the
       // file again and scale it down again for upload.
       //
-      // The reason is simply that we'd need to store that in memory for the lifetime
+      // The reason is simply that we'd need to store that scaled blob in memory for the lifetime
       // of the app if we were, as the user could switch conversations
       // before sending a message with attachments.
-
       const scaledOrNot = await AttachmentUtil.autoScaleFile(file);
 
       // `autoScaleFile` either

ts/components/dialog/debug/constants.ts

@@ -9,6 +9,6 @@ type DebugFeatureFlagsType = {
 export const DEBUG_FEATURE_FLAGS: DebugFeatureFlagsType = {
   // NOTE Put new feature flags in here during development so they are not available in production environments. Remove from here when they are ready for QA and production
   DEV: ['showPopoverAnchors', 'debugInputCommands'],
-  UNSUPPORTED: ['useTestNet', 'useLocalDevNet'],
+  UNSUPPORTED: ['useTestNet', 'useLocalDevNet', 'fsTTL30s'],
   UNTESTED: ['useOnionRequests', 'replaceLocalizedStringsWithKeys'],
 };

ts/models/conversationAttributes.ts

@@ -65,12 +65,16 @@ export interface ConversationAttributes {
    * - if the avatarPath points to a file that is not animated, staticAvatarPath is the same as avatarPath
    *
    * avatarInProfile is the avatar as the user set it, once downloaded and stored in the application attachments folder.
+   *
+   * Note: if the user is Pro, but didn't set an animated avatar, `avatarInProfile` and `fallbackAvatarInProfile` will point to the same file
    */
   avatarInProfile?: string;
   /**
    * This is the always static version of the avatar in profile.
    * If the user has pro, avatarInProfile will be used (and so his avatar will be animated if it was already).
    * If the user doesn't have pro, fallbackAvatarInProfile will be used, and the avatar will be displayed as a static image.
+   *
+   * Note: if the user is Pro, but didn't set an animated avatar, `avatarInProfile` and `fallbackAvatarInProfile` will point to the same file
    */
   fallbackAvatarInProfile?: string;
 

ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts

@@ -278,13 +278,13 @@ async function scheduleAvatarDownloadJobIfNeeded(groupPk: GroupPubkeyType) {
     if (!profileUrl || !profileKeyHex) {
       // no avatar set for this group: make sure we also remove the one we might have locally.
       if (conversation.get('avatarPointer') || conversation.get('profileKey')) {
-        conversation.set({
+        conversation.setKey('profileKey', undefined);
+        await conversation.setSessionProfile({
           avatarPointer: undefined,
-          profileKey: undefined,
-          avatarInProfile: undefined, // we want to remove the avatar here
-          fallbackAvatarInProfile: undefined, // and the fallback too
+          avatarPath: undefined,
+          fallbackAvatarPath: undefined,
+          displayName: null,
         });
-        await conversation.commit();
       }
 
       return;

ts/session/profile_manager/ProfileManager.ts

@@ -81,7 +81,13 @@ async function updateProfileOfContact(
     (!profileUrl || !profileKeyHex) &&
     (conversation.getAvatarInProfilePath() || conversation.getFallbackAvatarInProfilePath())
   ) {
-    conversation.set({ avatarInProfile: undefined, fallbackAvatarInProfile: undefined });
+    conversation.setKey('profileKey', undefined);
+    await conversation.setSessionProfile({
+      avatarPointer: undefined,
+      avatarPath: undefined,
+      fallbackAvatarPath: undefined,
+      displayName: null,
+    });
     changes = true;
   }
 

ts/state/ducks/metaGroups.ts

@@ -1150,11 +1150,12 @@ async function handleClearAvatarFromUI({ groupPk }: WithGroupPubkey) {
   }
 
   await checkWeAreAdminOrThrow(groupPk, 'handleAvatarChangeFromUI');
-  convo.set({
+  convo.setKey('profileKey', undefined)
+  await convo.setSessionProfile({
     avatarPointer: undefined,
-    avatarInProfile: undefined,
-    fallbackAvatarInProfile: undefined,
-    profileKey: undefined,
+    avatarPath: undefined,
+    fallbackAvatarPath: undefined,
+    displayName: null,
   });
 
   const createAtNetworkTimestamp = NetworkTime.now();

ts/state/ducks/user.ts

@@ -74,9 +74,14 @@ const clearOurAvatar = createAsyncThunk('user/clearOurAvatar', async () => {
     return;
   }
 
-  convo.set({ avatarPointer: undefined, avatarInProfile: undefined, profileKey: undefined });
+  convo.setKey('profileKey', undefined);
+  await convo.setSessionProfile({
+    avatarPath: undefined,
+    fallbackAvatarPath: undefined,
+    avatarPointer: undefined,
+    displayName: null,
+  });
 
-  await convo.commit();
   await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
 });
 

ts/util/attachment/attachmentsUtil.ts

@@ -1,13 +1,10 @@
 /* eslint-disable max-len */
-import imageType from 'image-type';
 
-import { arrayBufferToBlob } from 'blob-util';
 import { StagedAttachmentType } from '../../components/conversation/composition/CompositionBox';
 import { SignalService } from '../../protobuf';
 import { DecryptedAttachmentsManager } from '../../session/crypto/DecryptedAttachmentsManager';
 import { sendDataExtractionNotification } from '../../session/messages/outgoing/controlMessage/DataExtractionNotificationMessage';
 import { AttachmentType, save } from '../../types/Attachment';
-import { IMAGE_UNKNOWN, type MIMEType } from '../../types/MIME';
 import { getAbsoluteAttachmentPath, processNewAttachment } from '../../types/MessageAttachment';
 
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants';
@@ -33,43 +30,13 @@ import type { ProcessedLinkPreviewThumbnailType } from '../../webworker/workers/
  * 10. We use the grabbed data for upload of the attachments, get an url for each of them and send the url with the attachments details to the user/opengroup/closed group
  */
 
-export type BetterBlob = Blob & {
-  __brand: 'BetterBlob';
-  /** @deprecated -- `type` should not be used, it can be tampered with, use @see {@link contentType} */
-  type: Blob['type'];
-  contentType: MIMEType;
-  animated: boolean;
-  width?: number;
-  height?: number;
-};
-
-export async function createBetterBlobFromArrayBuffer(
-  arrayBuffer: ArrayBuffer,
-  contentType?: MIMEType,
-  isAnimated?: boolean
-): Promise<BetterBlob> {
-  const type = contentType ?? imageTypeFromArrayBuffer(arrayBuffer);
-  const blob = arrayBufferToBlob(arrayBuffer, type) satisfies Blob as unknown as BetterBlob;
-
-  blob.contentType = type;
-  blob.animated =
-    isAnimated ?? ((await ImageProcessor.imageMetadata(arrayBuffer))?.isAnimated || false);
-
-  return blob;
-}
-
 type MaxScaleSize = {
   maxSizeBytes?: number;
   maxHeightPx?: number;
   maxWidthPx?: number;
   maxSidePx?: number; // use this to make avatars cropped if too big and centered if too small.
 };
 
-function imageTypeFromArrayBuffer(arrayBuffer: ArrayBuffer) {
-  const data = new Uint8Array(arrayBuffer);
-  return imageType(data)?.mime ?? IMAGE_UNKNOWN;
-}
-
 export async function autoScaleFile(file: File, maxMeasurements?: MaxScaleSize) {
   // this call returns null if not an image, or not one we can process, or we cannot scale it down enough
   try {

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

@@ -60,7 +60,7 @@ export type ImageProcessorWorkerActions = {
 
   /**
    * Process an image to get a thumbnail matching our required details for link previews
-   * A link preview thumbnail is always a png, and resized to "contain" the image.
+   * A link preview thumbnail is always a png, and resized to "cover".
    */
   processForLinkPreviewThumbnail: (
     input: ArrayBufferLike,
@@ -71,10 +71,10 @@ export type ImageProcessorWorkerActions = {
    * Process an image to get a thumbnail matching our required details for in conversation thumbnails
    * This is about the thumbnail in the conversation list (for attachments in messages). We generate a preview to avoid loading huge files until we show them in fullscreen.
    *
-   * Note: an animated image or not animated will always be returned as a png.
+   * Note: animated or not, an image will always be returned as a png.
    * Note: eventually we want to support animated images as previews too. When we do, we will need to
    * convert them to webp and resize their preview heavily for performance reasons.
-   * A 'in conversation thumbnail' is always resized to "fill" the image.
+   * A 'in conversation thumbnail' is always resized to "cover".
    */
   processForInConversationThumbnail: (
     input: ArrayBufferLike,
@@ -89,13 +89,22 @@ export type ImageProcessorWorkerActions = {
    *  - not an image, or
    *  - not one we can process (i.e enforced lossless),
    *  - or we cannot get an image small enough after dropping the quality
-   * null will be returned. The caller should check if the requirements are met before trying to upload.
-   *
-   * The caller should check that the requirements have been met before trying to upload.
+   * null will be returned.
+   * The caller should always check if the requirements are met before trying to upload.
    *
    * Note: the lossy formats are jpeg, webp and avif.
    * Anything else that is an image supported by sharp will only be scaled down to maxSidePx.
-   * Anything else not an image supported by sharp will return null
+   * Anything else not an image supported by sharp will return null.
+   *
+   * To make it clear,
+   * - if the image is **lossy** and already fits the requirements, we return it as is.
+   * - if the image is **lossless**:
+   *  - if it fits the requirements, we return it as is (not even scaled down, as we'd need a loader in the staged attachments list to display the loading state)
+   *  - if it does not fit the requirements, we return null
+   * - if the image is **lossy** and doesn't fit:
+   *  - we first scale it down the maxSize, and then iterate over the quality to get something that fits the maxSizeBytes.
+   *  - if we cannot get a file under maxSizeBytes, we return null
+   *
    *
    * @param input: the image data to process
    * @param maxSidePx: we cap an image to this size. If the image is larger, it will be scaled down to this before we start dropping the quality.