From 601cc7b92af2fb31cb3025070de56ee9da111e08 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 2 Nov 2022 16:22:04 +1100 Subject: [PATCH] set disappearing messages config info to all kinds of messages --- .../Messages/Control Messages/CallMessage.swift | 8 ++++++++ .../Control Messages/ClosedGroupControlMessage.swift | 2 ++ .../Control Messages/DataExtractionNotification.swift | 2 ++ .../Control Messages/MessageRequestResponse.swift | 2 ++ .../Messages/Control Messages/ReadReceipt.swift | 2 ++ .../Messages/Control Messages/TypingIndicator.swift | 2 ++ .../Messages/Control Messages/UnsendRequest.swift | 2 ++ 7 files changed, 20 insertions(+) diff --git a/SessionMessagingKit/Messages/Control Messages/CallMessage.swift b/SessionMessagingKit/Messages/Control Messages/CallMessage.swift index 533f771ba..31977f92b 100644 --- a/SessionMessagingKit/Messages/Control Messages/CallMessage.swift +++ b/SessionMessagingKit/Messages/Control Messages/CallMessage.swift @@ -198,6 +198,14 @@ public final class CallMessage: ControlMessage { SNLog("Couldn't construct call message proto from: \(self).") return nil } + + // DisappearingMessagesConfiguration + do { + try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto) + } catch { + SNLog("Couldn't construct call message proto from: \(self).") + return nil + } } // MARK: - Description diff --git a/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift b/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift index b14a6f491..26e9d2588 100644 --- a/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift +++ b/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift @@ -339,6 +339,8 @@ public final class ClosedGroupControlMessage: ControlMessage { let contentProto = SNProtoContent.builder() let dataMessageProto = SNProtoDataMessage.builder() dataMessageProto.setClosedGroupControlMessage(try closedGroupControlMessage.build()) + // DisappearingMessagesConfiguration + try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto) // Group context try setGroupContextIfNeeded(db, on: dataMessageProto) contentProto.setDataMessage(try dataMessageProto.build()) diff --git a/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift b/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift index d54549df1..993db3966 100644 --- a/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift +++ b/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift @@ -92,6 +92,8 @@ public final class DataExtractionNotification: ControlMessage { } let contentProto = SNProtoContent.builder() contentProto.setDataExtractionNotification(try dataExtractionNotification.build()) + // DisappearingMessagesConfiguration + try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto) return try contentProto.build() } catch { SNLog("Couldn't construct data extraction notification proto from: \(self).") diff --git a/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift b/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift index 1955ecb2d..ca925ef8a 100644 --- a/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift +++ b/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift @@ -74,6 +74,8 @@ public final class MessageRequestResponse: ControlMessage { do { contentProto.setMessageRequestResponse(try messageRequestResponseProto.build()) + // DisappearingMessagesConfiguration + try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto) return try contentProto.build() } catch { SNLog("Couldn't construct unsend request proto from: \(self).") diff --git a/SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift b/SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift index 9437e6503..0e8ab117f 100644 --- a/SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift +++ b/SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift @@ -64,6 +64,8 @@ public final class ReadReceipt: ControlMessage { let contentProto = SNProtoContent.builder() do { contentProto.setReceiptMessage(try receiptProto.build()) + // DisappearingMessagesConfiguration + try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto) return try contentProto.build() } catch { SNLog("Couldn't construct read receipt proto from: \(self).") diff --git a/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift b/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift index 6a5e829b9..ca7f5e965 100644 --- a/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift +++ b/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift @@ -90,6 +90,8 @@ public final class TypingIndicator: ControlMessage { let contentProto = SNProtoContent.builder() do { contentProto.setTypingMessage(try typingIndicatorProto.build()) + // DisappearingMessagesConfiguration + try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto) return try contentProto.build() } catch { SNLog("Couldn't construct typing indicator proto from: \(self).") diff --git a/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift b/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift index 100edbefe..6d4faa2aa 100644 --- a/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift +++ b/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift @@ -70,6 +70,8 @@ public final class UnsendRequest: ControlMessage { let contentProto = SNProtoContent.builder() do { contentProto.setUnsendRequest(try unsendRequestProto.build()) + // DisappearingMessagesConfiguration + try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto) return try contentProto.build() } catch { SNLog("Couldn't construct unsend request proto from: \(self).")