From 9e80187214e74eb0baa677ec7d49101f4f4362f2 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 23 Nov 2022 14:06:13 +1100 Subject: [PATCH] refactor to make disappearing message after send work for control messages --- SessionMessagingKit/Database/Models/Interaction.swift | 8 ++++++++ .../Sending & Receiving/MessageSender.swift | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift index 19a8c3b61..878e2a6ee 100644 --- a/SessionMessagingKit/Database/Models/Interaction.swift +++ b/SessionMessagingKit/Database/Models/Interaction.swift @@ -410,6 +410,14 @@ public struct Interaction: Codable, Identifiable, Equatable, FetchableRecord, Mu default: break } + + // Start the disappearing messages timer if needed + if self.expiresStartedAtMs != nil { + JobRunner.upsert( + db, + job: DisappearingMessagesJob.updateNextRunIfNeeded(db) + ) + } } public mutating func didInsert(_ inserted: InsertionSuccess) { diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index 386cb9258..46e339cfb 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -610,16 +610,6 @@ public final class MessageSender { // Mark the message as sent try interaction.recipientStates .updateAll(db, RecipientState.Columns.state.set(to: RecipientState.State.sent)) - - // Start the disappearing messages timer if needed - JobRunner.upsert( - db, - job: DisappearingMessagesJob.updateNextRunIfNeeded( - db, - interaction: interaction, - startedAtMs: (Date().timeIntervalSince1970 * 1000) - ) - ) } }