From 49b22ab98eeab1e6eeb668592bc19b2282911093 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Mon, 5 Dec 2022 15:22:36 +1100
Subject: [PATCH] fix an issue where in some cases the new client will be
 marked as old ones

---
 SessionMessagingKit/Messages/Message.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SessionMessagingKit/Messages/Message.swift b/SessionMessagingKit/Messages/Message.swift
index 72feb6cd3..9f0664316 100644
--- a/SessionMessagingKit/Messages/Message.swift
+++ b/SessionMessagingKit/Messages/Message.swift
@@ -67,7 +67,10 @@ public class Message: Codable {
         guard
             let threadId: String = threadId,
             let disappearingMessagesConfiguration = try? DisappearingMessagesConfiguration.fetchOne(db, id: threadId)
-        else { return }
+        else {
+            proto.setExpirationTimer(0)
+            return
+        }
         
         proto.setExpirationTimer(UInt32(disappearingMessagesConfiguration.durationSeconds))
         proto.setLastDisappearingMessageChangeTimestamp(UInt64(disappearingMessagesConfiguration.lastChangeTimestampMs))