From 19fbceae36f36b0c1d93519d975f6e06329f7b11 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 30 Jan 2024 16:08:55 +1100
Subject: [PATCH] fix: das group control message go not expire

---
 ts/session/disappearing_messages/index.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ts/session/disappearing_messages/index.ts b/ts/session/disappearing_messages/index.ts
index 10c54c6b7..16c53475e 100644
--- a/ts/session/disappearing_messages/index.ts
+++ b/ts/session/disappearing_messages/index.ts
@@ -561,12 +561,15 @@ function getMessageReadyToDisappear(
     messageExpirationFromRetrieve &&
     messageExpirationFromRetrieve > 0
   ) {
-    const expirationStartTimestamp = messageExpirationFromRetrieve - expireTimer * 1000;
-    const expires_at = messageExpirationFromRetrieve;
-    messageModel.set({
-      expirationStartTimestamp,
-      expires_at,
-    });
+    // Note: closed groups control message do not disappear
+    if (!conversationModel.isClosedGroup() && !messageModel.isControlMessage()) {
+      const expirationStartTimestamp = messageExpirationFromRetrieve - expireTimer * 1000;
+      const expires_at = messageExpirationFromRetrieve;
+      messageModel.set({
+        expirationStartTimestamp,
+        expires_at,
+      });
+    }
   }
 
   return messageModel;