From 5063feeb6a016585ad122004aa59019db1340a6c Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Wed, 28 Jun 2023 17:39:38 +1000
Subject: [PATCH] fix an issue where message is not received & minor refactor
 on disappearing message job

---
 .../DisappearingMessageConfiguration.swift    |  8 ++++
 .../Jobs/Types/DisappearingMessagesJob.swift  | 43 +++++++++++++------
 .../MessageReceiver+ExpirationTimers.swift    |  4 +-
 3 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
index 7c54842d6..bee8227eb 100644
--- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
+++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
@@ -253,6 +253,10 @@ extension DisappearingMessagesConfiguration {
                 ]
                 .map { TimeInterval($0)  }
                 #if targetEnvironment(simulator)
+                    result.insert(
+                        TimeInterval(60),
+                        at: 0
+                    )
                     result.insert(
                         TimeInterval(10),
                         at: 0
@@ -268,6 +272,10 @@ extension DisappearingMessagesConfiguration {
                 ]
                 .map { TimeInterval($0)  }
                 #if targetEnvironment(simulator)
+                    result.insert(
+                        TimeInterval(60),
+                        at: 0
+                    )
                     result.insert(
                         TimeInterval(10),
                         at: 0
diff --git a/SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift b/SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift
index 9139f547b..44319cee7 100644
--- a/SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift
+++ b/SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift
@@ -79,21 +79,30 @@ public extension DisappearingMessagesJob {
     }
     
     static func updateNextRunIfNeeded(_ db: Database, lastReadTimestampMs: Int64, threadId: String) {
-        let messageHashes: [String] = (try? Interaction
+        struct ExpirationInfo: Codable, Hashable, FetchableRecord {
+            let expiresInSeconds: TimeInterval
+            let serverHash: String
+        }
+        
+        var expirationInfo: [String: TimeInterval] = (try? Interaction
             .filter(
                 Interaction.Columns.threadId == threadId &&
                 Interaction.Columns.timestampMs <= lastReadTimestampMs &&
                 Interaction.Columns.expiresInSeconds > 0 &&
                 Interaction.Columns.expiresStartedAtMs == nil
             )
-            .select(Interaction.Columns.serverHash)
+            .select(
+                Interaction.Columns.expiresInSeconds,
+                Interaction.Columns.serverHash
+            )
+            .asRequest(of: ExpirationInfo.self)
             .fetchAll(db))
             .defaulting(to: [])
-            .compactMap{ $0 }
+            .grouped(by: \.serverHash)
+            .compactMapValues{ $0.first?.expiresInSeconds }
         
         // If there were no message hashes then none of the messages sent before lastReadTimestampMs are expiring messages
-        guard (messageHashes.count > 0) else { return }
-        
+        guard (expirationInfo.count > 0) else { return }
         let timestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs()
         
         let userPublicKey: String = getUserHexEncodedPublicKey(db)
@@ -103,27 +112,33 @@ public extension DisappearingMessagesJob {
                 return SnodeAPI.getExpiries(
                     from: snode,
                     associatedWith: userPublicKey,
-                    of: messageHashes
+                    of: expirationInfo.map { $0.key }
                 )
                 .map { (_, response) in
                     Storage.shared.writeAsync { db in
                         try response.expiries.forEach { hash, expireAtMs in
-                            let expiresInSeconds: TimeInterval = TimeInterval((expireAtMs - UInt64(timestampMs))) / 1000
+                            guard let expireInSeconds: TimeInterval = expirationInfo[hash] else { return }
+                            let startAtMs: TimeInterval = TimeInterval(expireAtMs - UInt64(expireInSeconds * 1000))
                             
                             _ = try Interaction
                                 .filter(Interaction.Columns.serverHash == hash)
                                 .updateAll(
                                     db,
-                                    Interaction.Columns.expiresInSeconds.set(to: expiresInSeconds)
+                                    Interaction.Columns.expiresStartedAtMs.set(to: startAtMs)
                                 )
+                            
+                            guard let index = expirationInfo.index(forKey: hash) else { return }
+                            expirationInfo.remove(at: index)
                         }
                         
-                        _ = try Interaction
-                            .filter(messageHashes.contains(Interaction.Columns.serverHash))
-                            .updateAll(
-                                db,
-                                Interaction.Columns.expiresStartedAtMs.set(to: TimeInterval(timestampMs))
-                            )
+                        try expirationInfo.forEach { key, _ in
+                            _ = try Interaction
+                                .filter(Interaction.Columns.serverHash == key)
+                                .updateAll(
+                                    db,
+                                    Interaction.Columns.expiresStartedAtMs.set(to: timestampMs)
+                                )
+                        }
                         
                         JobRunner.upsert(
                             db,
diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
index eb981f54d..fb41f0d1f 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
@@ -183,6 +183,8 @@ extension MessageReceiver {
         )
         
         let updateControlMewssage: () throws -> () = {
+            guard message is ExpirationTimerUpdate else { return }
+            
             _ = try Interaction
                 .filter(Interaction.Columns.threadId == threadId)
                 .filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
@@ -243,8 +245,6 @@ extension MessageReceiver {
             }
         }
         
-        guard message is ExpirationTimerUpdate else { return }
-        
         try updateControlMewssage()
     }
 }