WIP

ts/interactions/conversationInteractions.ts

@@ -37,7 +37,7 @@ import { IMAGE_JPEG } from '../types/MIME';
 import { FSv2 } from '../fileserver';
 import { fromBase64ToArray, toHex } from '../session/utils/String';
 import { SessionButtonColor } from '../components/session/SessionButton';
-import { perfEnd, perfStart } from '../session/utils/Performamce';
+import { perfEnd, perfStart } from '../session/utils/Performance';
 
 export const getCompleteUrlForV2ConvoId = async (convoId: string) => {
   if (convoId.match(openGroupV2ConversationIdRegex)) {

ts/models/conversation.ts

@@ -45,7 +45,7 @@ import { useDispatch } from 'react-redux';
 import { updateConfirmModal } from '../state/ducks/modalDialog';
 import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
 import { DURATION, SWARM_POLLING_TIMEOUT } from '../session/constants';
-import { perfEnd, perfStart } from '../session/utils/Performamce';
+import { perfEnd, perfStart } from '../session/utils/Performance';
 
 export enum ConversationTypeEnum {
   GROUP = 'group',

ts/models/message.ts

@@ -20,7 +20,18 @@ import {
 import autoBind from 'auto-bind';
 import { saveMessage } from '../../ts/data/data';
 import { ConversationModel, ConversationTypeEnum } from './conversation';
-import { actions as conversationActions } from '../state/ducks/conversations';
+import {
+  actions as conversationActions,
+  FindAndFormatContactType,
+  PropsForExpirationTimer,
+  PropsForGroupUpdate,
+  PropsForGroupUpdateAdd,
+  PropsForGroupUpdateArray,
+  PropsForGroupUpdateGeneral,
+  PropsForGroupUpdateKicked,
+  PropsForGroupUpdateName,
+  PropsForGroupUpdateRemove,
+} from '../state/ducks/conversations';
 import { VisibleMessage } from '../session/messages/outgoing/visibleMessage/VisibleMessage';
 import { buildSyncMessage } from '../session/utils/syncUtils';
 import { isOpenGroupV2 } from '../opengroup/utils/OpenGroupUtils';
@@ -35,7 +46,7 @@ import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMes
 import { getV2OpenGroupRoom } from '../data/opengroups';
 import { getMessageController } from '../session/messages';
 import { isUsFromCache } from '../session/utils/User';
-import { perfEnd, perfStart } from '../session/utils/Performamce';
+import { perfEnd, perfStart } from '../session/utils/Performance';
 
 export class MessageModel extends Backbone.Model<MessageAttributes> {
   public propsForTimerNotification: any;
@@ -74,25 +85,26 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
 
   // Keep props ready
   public generateProps(triggerEvent = true) {
-    const propsForTimerNotification = this.isExpirationTimerUpdate()
-      ? this.getPropsForTimerNotification()
-      : null;
-    const propsForGroupNotification = this.isGroupUpdate()
-      ? this.getPropsForGroupNotification()
-      : null;
-    const propsForGroupInvitation = this.isGroupInvitation()
-      ? this.getPropsForGroupInvitation()
-      : null;
+    const propsForTimerNotification = this.getPropsForTimerNotification();
+    const propsForGroupNotification = this.getPropsForGroupNotification();
+    const propsForGroupInvitation = this.getPropsForGroupInvitation();
     const propsForDataExtractionNotification = this.isDataExtractionNotification()
       ? this.getPropsForDataExtractionNotification()
       : null;
     const propsForSearchResult = this.getPropsForSearchResult();
     const propsForMessage = this.getPropsForMessage();
 
-    const messageProps = { propsForMessage };
+    const messageProps = {
+      propsForMessage,
+      propsForSearchResult,
+      propsForDataExtractionNotification,
+      propsForGroupInvitation,
+      propsForGroupNotification,
+      propsForTimerNotification,
+    };
 
     if (triggerEvent) {
-      window.inboxStore?.dispatch(conversationActions.messageChanged(this));
+      window.inboxStore?.dispatch(conversationActions.messageChanged(messageProps));
     }
   }
 
@@ -272,39 +284,35 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     await window.Signal.Migrations.deleteExternalMessageFiles(this.attributes);
   }
 
-  public getPropsForTimerNotification() {
+  public getPropsForTimerNotification(): PropsForExpirationTimer {
+    if (!this.isExpirationTimerUpdate()) {
+      return null;
+    }
     const timerUpdate = this.get('expirationTimerUpdate');
     if (!timerUpdate || !timerUpdate.source) {
       return null;
     }
 
     const { expireTimer, fromSync, source } = timerUpdate;
-    const timespan = window.Whisper.ExpirationTimerOptions.getName(expireTimer || 0);
+    const timespan = window.Whisper.ExpirationTimerOptions.getName(expireTimer || 0) as
+      | string
+      | null;
     const disabled = !expireTimer;
 
-    const basicProps = {
-      type: 'fromOther',
+    const basicProps: PropsForExpirationTimer = {
       ...this.findAndFormatContact(source),
       timespan,
       disabled,
+      type: fromSync ? 'fromSync' : UserUtils.isUsFromCache(source) ? 'fromMe' : 'fromOther',
     };
 
-    if (fromSync) {
-      return {
-        ...basicProps,
-        type: 'fromSync',
-      };
-    } else if (UserUtils.isUsFromCache(source)) {
-      return {
-        ...basicProps,
-        type: 'fromMe',
-      };
-    }
-
     return basicProps;
   }
 
   public getPropsForGroupInvitation() {
+    if (!this.isGroupInvitation()) {
+      return null;
+    }
     const invitation = this.get('groupInvitation');
 
     let direction = this.get('direction');
@@ -350,7 +358,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     return getConversationController().get(pubkey);
   }
 
-  public findAndFormatContact(pubkey: string) {
+  public findAndFormatContact(pubkey: string): FindAndFormatContactType {
     const contactModel = this.findContact(pubkey);
     let profileName;
     if (pubkey === window.storage.get('primaryDevicePubKey')) {
@@ -360,84 +368,96 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     }
 
     return {
-      phoneNumber: pubkey,
-      color: null,
-      avatarPath: contactModel ? contactModel.getAvatarPath() : null,
-      name: contactModel ? contactModel.getName() : null,
-      profileName,
-      title: contactModel ? contactModel.getTitle() : null,
+      phoneNumber: pubkey as string,
+      avatarPath: (contactModel ? contactModel.getAvatarPath() : null) as string | null,
+      name: (contactModel ? contactModel.getName() : null) as string | null,
+      profileName: profileName as string | null,
+      title: (contactModel ? contactModel.getTitle() : null) as string | null,
     };
   }
 
-  public getPropsForGroupNotification() {
+  public getPropsForGroupNotification(): PropsForGroupUpdate {
+    if (!this.isGroupUpdate()) {
+      return null;
+    }
     const groupUpdate = this.get('group_update');
-    const changes = [];
+    const changes: PropsForGroupUpdateArray = [];
 
     if (!groupUpdate.name && !groupUpdate.left && !groupUpdate.joined) {
-      changes.push({
+      const change: PropsForGroupUpdateGeneral = {
         type: 'general',
-      });
+      };
+      changes.push(change);
     }
 
     if (groupUpdate.joined) {
-      changes.push({
+      const change: PropsForGroupUpdateAdd = {
         type: 'add',
         contacts: _.map(
           Array.isArray(groupUpdate.joined) ? groupUpdate.joined : [groupUpdate.joined],
           phoneNumber => this.findAndFormatContact(phoneNumber)
         ),
-      });
+      };
+      changes.push(change);
     }
 
     if (groupUpdate.kicked === 'You') {
-      changes.push({
+      const change: PropsForGroupUpdateKicked = {
         type: 'kicked',
         isMe: true,
-      });
+      };
+      changes.push(change);
     } else if (groupUpdate.kicked) {
-      changes.push({
+      const change: PropsForGroupUpdateKicked = {
         type: 'kicked',
+        isMe: false,
         contacts: _.map(
           Array.isArray(groupUpdate.kicked) ? groupUpdate.kicked : [groupUpdate.kicked],
           phoneNumber => this.findAndFormatContact(phoneNumber)
         ),
-      });
+      };
+      changes.push(change);
     }
 
     if (groupUpdate.left === 'You') {
-      changes.push({
+      const change: PropsForGroupUpdateRemove = {
         type: 'remove',
         isMe: true,
-      });
+      };
+      changes.push(change);
     } else if (groupUpdate.left) {
       if (
         Array.isArray(groupUpdate.left) &&
         groupUpdate.left.length === 1 &&
         groupUpdate.left[0] === UserUtils.getOurPubKeyStrFromCache()
       ) {
-        changes.push({
+        const change: PropsForGroupUpdateRemove = {
           type: 'remove',
           isMe: true,
-        });
+        };
+        changes.push(change);
       } else if (
         typeof groupUpdate.left === 'string' ||
         (Array.isArray(groupUpdate.left) && groupUpdate.left.length === 1)
       ) {
-        changes.push({
+        const change: PropsForGroupUpdateRemove = {
           type: 'remove',
+          isMe: false,
           contacts: _.map(
             Array.isArray(groupUpdate.left) ? groupUpdate.left : [groupUpdate.left],
             phoneNumber => this.findAndFormatContact(phoneNumber)
           ),
-        });
+        };
+        changes.push(change);
       }
     }
 
     if (groupUpdate.name) {
-      changes.push({
+      const change: PropsForGroupUpdateName = {
         type: 'name',
-        newName: groupUpdate.name,
-      });
+        newName: groupUpdate.name as string,
+      };
+      changes.push(change);
     }
 
     return {

ts/receiver/contentMessage.ts

@@ -16,7 +16,7 @@ import { ECKeyPair } from './keypairs';
 import { handleConfigurationMessage } from './configMessage';
 import { ConversationTypeEnum } from '../models/conversation';
 import { removeMessagePadding } from '../session/crypto/BufferPadding';
-import { perfEnd, perfStart } from '../session/utils/Performamce';
+import { perfEnd, perfStart } from '../session/utils/Performance';
 
 export async function handleContentMessage(envelope: EnvelopePlus) {
   try {

ts/state/ducks/conversations.ts

@@ -53,6 +53,63 @@ export type MessageTypeInConvo = {
 
 export type LastMessageStatusType = MessageDeliveryStatus | null;
 
+export type FindAndFormatContactType = {
+  phoneNumber: string;
+  avatarPath: string | null;
+  name: string | null;
+  profileName: string | null;
+  title: string | null;
+};
+
+export type PropsForExpirationTimer = {
+  timespan: string | null;
+  disabled: boolean;
+  phoneNumber: string;
+  avatarPath: string | null;
+  name: string | null;
+  profileName: string | null;
+  title: string | null;
+  type: 'fromMe' | 'fromSync' | 'fromOther';
+} | null;
+
+export type PropsForGroupUpdateGeneral = {
+  type: 'general';
+};
+
+export type PropsForGroupUpdateAdd = {
+  type: 'add';
+  contacts?: Array<FindAndFormatContactType>;
+};
+
+export type PropsForGroupUpdateKicked = {
+  type: 'kicked';
+  isMe: boolean;
+  contacts?: Array<FindAndFormatContactType>;
+};
+
+export type PropsForGroupUpdateRemove = {
+  type: 'remove';
+  isMe: boolean;
+  contacts?: Array<FindAndFormatContactType>;
+};
+
+export type PropsForGroupUpdateName = {
+  type: 'name';
+  newName: string;
+};
+
+export type PropsForGroupUpdateArray = Array<
+  | PropsForGroupUpdateGeneral
+  | PropsForGroupUpdateAdd
+  | PropsForGroupUpdateKicked
+  | PropsForGroupUpdateName
+  | PropsForGroupUpdateRemove
+>;
+
+export type PropsForGroupUpdate = {
+  changes: PropsForGroupUpdateArray;
+} | null;
+
 export type LastMessageType = {
   status: LastMessageStatusType;
   text: string | null;