From 71449c22b1569515fb8432658973d3703b7064d2 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Mon, 9 Jan 2023 10:42:58 +1100
Subject: [PATCH] feat: remove previous disappearing messages change info
 message when adding a new one

---
 .../Settings/ThreadDisappearingMessagesViewModel.swift      | 6 ++++++
 .../Message Handling/MessageReceiver+ExpirationTimers.swift | 6 ++++++
 .../Sending & Receiving/MessageReceiver.swift               | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index 6b37e97a3..10005d4a8 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -459,6 +459,12 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
             _ = try updatedConfig.saved(db)
             
             let nowInMs: Double = floor(Date().timeIntervalSince1970 * 1000)
+            
+            _ = try Interaction
+                .filter(Interaction.Columns.threadId == threadId)
+                .filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
+                .deleteAll(db)
+            
             let interaction: Interaction = try Interaction(
                 threadId: threadId,
                 authorId: getUserHexEncodedPublicKey(db),
diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
index 3943db458..c05fd26da 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
@@ -48,6 +48,12 @@ extension MessageReceiver {
         
         try remoteConfig.save(db)
         
+        // Remove previous info messages
+        _ = try Interaction
+            .filter(Interaction.Columns.threadId == thread.id)
+            .filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
+            .deleteAll(db)
+        
         // Add an info message for the user
         _ = try Interaction(
             serverHash: nil, // Intentionally null so sync messages are seen as duplicates
diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
index 9de28d0c4..44b5bc413 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
@@ -365,6 +365,11 @@ public enum MessageReceiver {
         )
         
         _ = try remoteConfig.save(db)
+        
+        _ = try Interaction
+            .filter(Interaction.Columns.threadId == threadId)
+            .filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
+            .deleteAll(db)
 
         _ = try Interaction(
             serverHash: message.serverHash,