Merge pull request #651 from mpretty-cyro/fix/outgoing-disappearing-messages

Fixed a bug where disappearing messages weren't working for local outgoing messages

Session/Conversations/ConversationVC+Interaction.swift

@@ -369,9 +369,15 @@ extension ConversationVC:
                     body: text,
                     timestampMs: sentTimestampMs,
                     hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: text),
+                    expiresInSeconds: try? DisappearingMessagesConfiguration
+                        .select(.durationSeconds)
+                        .filter(id: threadId)
+                        .filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
+                        .asRequest(of: TimeInterval.self)
+                        .fetchOne(db),
                     linkPreviewUrl: linkPreviewDraft?.urlString
                 ).inserted(db)
-
+                
                 // If there is a LinkPreview and it doesn't match an existing one then add it now
                 if
                     let linkPreviewDraft: LinkPreviewDraft = linkPreviewDraft,
@@ -459,7 +465,13 @@ extension ConversationVC:
                     variant: .standardOutgoing,
                     body: text,
                     timestampMs: sentTimestampMs,
-                    hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: text)
+                    hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: text),
+                    expiresInSeconds: try? DisappearingMessagesConfiguration
+                        .select(.durationSeconds)
+                        .filter(id: threadId)
+                        .filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
+                        .asRequest(of: TimeInterval.self)
+                        .fetchOne(db)
                 ).inserted(db)
 
                 try MessageSender.send(

Session/Notifications/AppNotifications.swift

@@ -436,7 +436,13 @@ class NotificationActionHandler {
                 variant: .standardOutgoing,
                 body: replyText,
                 timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000)),
-                hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: replyText)
+                hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: replyText),
+                expiresInSeconds: try? DisappearingMessagesConfiguration
+                    .select(.durationSeconds)
+                    .filter(id: threadId)
+                    .filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
+                    .asRequest(of: TimeInterval.self)
+                    .fetchOne(db)
             ).inserted(db)
             
             try Interaction.markAsRead(

SessionMessagingKit/Database/Models/OpenGroup.swift

@@ -233,6 +233,12 @@ public class SMKOpenGroup: NSObject {
                     authorId: userId,
                     variant: .standardOutgoing,
                     timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000)),
+                    expiresInSeconds: try? DisappearingMessagesConfiguration
+                        .select(.durationSeconds)
+                        .filter(id: userId)
+                        .filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
+                        .asRequest(of: TimeInterval.self)
+                        .fetchOne(db),
                     linkPreviewUrl: urlString
                 )
                 .saved(db)

SessionShareExtension/ThreadPickerVC.swift

@@ -236,6 +236,12 @@ final class ThreadPickerVC: UIViewController, UITableViewDataSource, UITableView
                         body: body,
                         timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000)),
                         hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: body),
+                        expiresInSeconds: try? DisappearingMessagesConfiguration
+                            .select(.durationSeconds)
+                            .filter(id: threadId)
+                            .filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
+                            .asRequest(of: TimeInterval.self)
+                            .fetchOne(db),
                         linkPreviewUrl: (isSharingUrl ? attachments.first?.linkPreviewDraft?.urlString : nil)
                     ).inserted(db)