use local disappearing messages setting for call messages and data extraction notifications

Session/Calls/Call Management/SessionCall.swift

@@ -241,6 +241,7 @@ public final class SessionCall: CurrentCallProtocol, WebRTCSessionDelegate {
             expiresInSeconds: message.expiresInSeconds,
             expiresStartedAtMs: message.expiresStartedAtMs
         )
+        .withDisappearingMessagesConfiguration(config: disappearingMessagesConfiguration)
         .inserted(db)
         
         self.callInteractionId = interaction?.id

SessionMessagingKit/Database/Models/Interaction.swift

@@ -485,10 +485,10 @@ public extension Interaction {
         return self
     }
     
-    func withDisappearingMessagesConfiguration(config: DisappearingMessagesConfiguration) -> Interaction {
+    func withDisappearingMessagesConfiguration(config: DisappearingMessagesConfiguration?) -> Interaction {
         return self.with(
-            expiresInSeconds: config.durationSeconds,
+            expiresInSeconds: config?.durationSeconds,
-            expiresStartedAtMs: (config.type == .disappearAfterSend ? Double(self.timestampMs) : nil)
+            expiresStartedAtMs: (config?.type == .disappearAfterSend ? Double(self.timestampMs) : nil)
         )
     }
 }

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift

@@ -303,9 +303,9 @@ extension MessageReceiver {
                 timestampMs: (timestampMs * 1000),
                 userPublicKey: currentUserPublicKey,
                 openGroup: nil
-            ),
+            )
-            expiresInSeconds: message.expiresInSeconds,
+        )
-            expiresStartedAtMs: message.expiresStartedAtMs
+        .withDisappearingMessagesConfiguration(db) // Should follow local setting
-        ).inserted(db)
+        .inserted(db)
     }
 }

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+DataExtractionNotification.swift

@@ -39,9 +39,9 @@ extension MessageReceiver {
                 timestampMs: (timestampMs * 1000),
                 userPublicKey: getUserHexEncodedPublicKey(db),
                 openGroup: nil
-            ),
+            )
-            expiresInSeconds: message.expiresInSeconds,
+        )
-            expiresStartedAtMs: message.expiresStartedAtMs
+        .withDisappearingMessagesConfiguration(db) // Should follow local setting
-        ).inserted(db)
+        .inserted(db)
     }
 }

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift

@@ -134,10 +134,19 @@ extension MessageReceiver {
     
     public static func updateContactDisappearingMessagesVersionIfNeeded(
         _ db: Database,
+        messageVariant: Message.Variant?,
         contactId: String?,
         version: FeatureVersion?
     ) {
-        guard let contactId: String = contactId, let version: FeatureVersion = version else { return }
+        guard
+            let messageVariant: Message.Variant = messageVariant,
+            let contactId: String = contactId,
+            let version: FeatureVersion = version
+        else {
+            return
+        }
+        
+        guard [ .visibleMessage, .expirationTimerUpdate ].contains(messageVariant) else { return }
         
         _ = try? Contact
             .filter(id: contactId)

SessionMessagingKit/Sending & Receiving/MessageReceiver.swift

@@ -210,6 +210,7 @@ public enum MessageReceiver {
         
         MessageReceiver.updateContactDisappearingMessagesVersionIfNeeded(
             db,
+            messageVariant: .init(from: message),
             contactId: message.sender,
             version: ((!proto.hasExpirationType && !proto.hasExpirationTimer) ?
                 .legacyDisappearingMessages :