fix logic error for message ttl

SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift

@@ -196,20 +196,24 @@ extension MessageSender {
     // MARK: - Convenience
     
     internal static func getSpecifiedTTL(
-        _ db: Database,
-        threadId: String,
         message: Message,
         isSyncMessage: Bool
     ) -> UInt64? {
-        guard
+        guard let expiresInSeconds = message.expiresInSeconds else { return nil }
-            let disappearingMessagesConfiguration = try? DisappearingMessagesConfiguration.fetchOne(db, id: threadId),
+        
-            disappearingMessagesConfiguration.isEnabled,
+        // Sync message
-            (
+        if isSyncMessage {
-                disappearingMessagesConfiguration.type == .disappearAfterSend ||
+            return UInt64(expiresInSeconds * 1000)
-                isSyncMessage
+        }
-            )
+        
-        else { return nil }
+        // Disappear after send
+        if let expiresStartedAtMs = message.expiresStartedAtMs,
+            let sentTimestamp = message.sentTimestamp,
+            UInt64(expiresStartedAtMs) == sentTimestamp
+        {
+            return UInt64(expiresInSeconds * 1000)
+        }
         
-        return UInt64(disappearingMessagesConfiguration.durationSeconds * 1000)
+        return nil
     }
 }

SessionMessagingKit/Sending & Receiving/MessageSender.swift

@@ -349,7 +349,7 @@ public final class MessageSender {
             recipient: message.recipient!,
             data: base64EncodedData,
             ttl: MessageSender
-                .getSpecifiedTTL(db, threadId: threadId, message: message, isSyncMessage: isSyncMessage)
+                .getSpecifiedTTL(message: message, isSyncMessage: isSyncMessage)
                 .defaulting(to: message.ttl),
             timestampMs: UInt64(messageSendTimestamp)
         )