feat: moved setToExpire calls to the correct locations within the message pipeline depending on the expirationType of a message model

ts/models/conversation.ts

@@ -2010,8 +2010,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const messageId = await model.commit(false);
     model.set({ id: messageId });
 
-    await model.setToExpire();
-
     const messageModelProps = model.getMessageModelProps();
     window.inboxStore?.dispatch(conversationActions.messagesChanged([messageModelProps]));
     const unreadCount = await this.getUnreadCount();

ts/receiver/contentMessage.ts

@@ -781,7 +781,7 @@ export async function handleDataExtractionNotification(
     // TODO legacy messages support will be removed in a future release
     const isLegacyMode = convo && convo.isPrivate() && expirationType === 'legacy';
 
-    await convo.addSingleIncomingMessage({
+    const msgModel = await convo.addSingleIncomingMessage({
       source,
       sent_at: envelopeTimestamp,
       dataExtractionNotification: {
@@ -798,6 +798,10 @@ export async function handleDataExtractionNotification(
           ? setExpirationStartTimestamp('deleteAfterSend', undefined, isLegacyMode)
           : undefined,
     });
+
+    if (isLegacyMode || expirationType === 'deleteAfterSend') {
+      await msgModel.setToExpire();
+    }
     convo.updateLastMessage();
   }
 }

ts/receiver/queuedJob.ts

@@ -350,6 +350,7 @@ export async function handleMessageJob(
           messageModel.get('expirationType') === 'legacy'
         ),
       });
+      messageModel.setToExpire();
     }
 
     if (messageModel.isExpirationTimerUpdate()) {

ts/session/group/closed-group.ts

@@ -188,6 +188,10 @@ export async function addUpdateMessage(
 
   if (UserUtils.isUsFromCache(sender)) {
     const outgoingMessage = await convo.addSingleOutgoingMessage(msgModel);
+    // NOTE will always be delete after send
+    if (expirationType) {
+      outgoingMessage.setToExpire();
+    }
     return outgoingMessage;
   }
 
@@ -203,6 +207,10 @@ export async function addUpdateMessage(
   });
 
   await convo.commit();
+
+  if (expirationType) {
+    incomingMessage.setToExpire();
+  }
   return incomingMessage;
 }
 

ts/session/sending/MessageSentHandler.ts

@@ -151,6 +151,7 @@ async function handleMessageSentSuccess(
           isLegacySentMode
         ),
       });
+      fetchedMessage.setToExpire();
     }
   }