From 00f93a2754fd32aa93eb15c16243b09444f350c8 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 30 Oct 2023 11:21:02 +1100
Subject: [PATCH] fix: send sync message with the expireUpdate if provided

---
 ts/session/utils/sync/syncUtils.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 8e8f44400..e8176d1d1 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -294,7 +294,8 @@ const buildSyncVisibleMessage = (
   identifier: string,
   dataMessage: SignalService.DataMessage,
   timestamp: number,
-  syncTarget: string
+  syncTarget: string,
+  expireUpdate?: DisappearingMessageUpdate
 ) => {
   const body = dataMessage.body || undefined;
 
@@ -320,7 +321,7 @@ const buildSyncVisibleMessage = (
   }) as Array<AttachmentPointerWithUrl>;
   const quote = (dataMessage.quote as Quote) || undefined;
   const preview = (dataMessage.preview as Array<PreviewWithAttachmentUrl>) || [];
-  const expireTimer = dataMessage.expireTimer;
+  const dataMessageExpireTimer = dataMessage.expireTimer;
 
   return new VisibleMessage({
     identifier,
@@ -330,7 +331,8 @@ const buildSyncVisibleMessage = (
     quote,
     preview,
     syncTarget,
-    expireTimer,
+    expireTimer: expireUpdate?.expirationTimer || dataMessageExpireTimer,
+    expirationType: expireUpdate?.expirationType,
   });
 };
 
@@ -409,7 +411,8 @@ export const buildSyncMessage = (
     identifier,
     dataMessage,
     timestamp,
-    syncTarget
+    syncTarget,
+    expireUpdate
   );
   return visibleSyncMessage;
 };