set disappearing messages config info to all kinds of messages

pull/941/head
ryanzhao 2 years ago
parent 38594f8dc1
commit 601cc7b92a

@ -198,6 +198,14 @@ public final class CallMessage: ControlMessage {
SNLog("Couldn't construct call message proto from: \(self).") SNLog("Couldn't construct call message proto from: \(self).")
return nil return nil
} }
// DisappearingMessagesConfiguration
do {
try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
} catch {
SNLog("Couldn't construct call message proto from: \(self).")
return nil
}
} }
// MARK: - Description // MARK: - Description

@ -339,6 +339,8 @@ public final class ClosedGroupControlMessage: ControlMessage {
let contentProto = SNProtoContent.builder() let contentProto = SNProtoContent.builder()
let dataMessageProto = SNProtoDataMessage.builder() let dataMessageProto = SNProtoDataMessage.builder()
dataMessageProto.setClosedGroupControlMessage(try closedGroupControlMessage.build()) dataMessageProto.setClosedGroupControlMessage(try closedGroupControlMessage.build())
// DisappearingMessagesConfiguration
try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
// Group context // Group context
try setGroupContextIfNeeded(db, on: dataMessageProto) try setGroupContextIfNeeded(db, on: dataMessageProto)
contentProto.setDataMessage(try dataMessageProto.build()) contentProto.setDataMessage(try dataMessageProto.build())

@ -92,6 +92,8 @@ public final class DataExtractionNotification: ControlMessage {
} }
let contentProto = SNProtoContent.builder() let contentProto = SNProtoContent.builder()
contentProto.setDataExtractionNotification(try dataExtractionNotification.build()) contentProto.setDataExtractionNotification(try dataExtractionNotification.build())
// DisappearingMessagesConfiguration
try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
return try contentProto.build() return try contentProto.build()
} catch { } catch {
SNLog("Couldn't construct data extraction notification proto from: \(self).") SNLog("Couldn't construct data extraction notification proto from: \(self).")

@ -74,6 +74,8 @@ public final class MessageRequestResponse: ControlMessage {
do { do {
contentProto.setMessageRequestResponse(try messageRequestResponseProto.build()) contentProto.setMessageRequestResponse(try messageRequestResponseProto.build())
// DisappearingMessagesConfiguration
try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
return try contentProto.build() return try contentProto.build()
} catch { } catch {
SNLog("Couldn't construct unsend request proto from: \(self).") SNLog("Couldn't construct unsend request proto from: \(self).")

@ -64,6 +64,8 @@ public final class ReadReceipt: ControlMessage {
let contentProto = SNProtoContent.builder() let contentProto = SNProtoContent.builder()
do { do {
contentProto.setReceiptMessage(try receiptProto.build()) contentProto.setReceiptMessage(try receiptProto.build())
// DisappearingMessagesConfiguration
try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
return try contentProto.build() return try contentProto.build()
} catch { } catch {
SNLog("Couldn't construct read receipt proto from: \(self).") SNLog("Couldn't construct read receipt proto from: \(self).")

@ -90,6 +90,8 @@ public final class TypingIndicator: ControlMessage {
let contentProto = SNProtoContent.builder() let contentProto = SNProtoContent.builder()
do { do {
contentProto.setTypingMessage(try typingIndicatorProto.build()) contentProto.setTypingMessage(try typingIndicatorProto.build())
// DisappearingMessagesConfiguration
try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
return try contentProto.build() return try contentProto.build()
} catch { } catch {
SNLog("Couldn't construct typing indicator proto from: \(self).") SNLog("Couldn't construct typing indicator proto from: \(self).")

@ -70,6 +70,8 @@ public final class UnsendRequest: ControlMessage {
let contentProto = SNProtoContent.builder() let contentProto = SNProtoContent.builder()
do { do {
contentProto.setUnsendRequest(try unsendRequestProto.build()) contentProto.setUnsendRequest(try unsendRequestProto.build())
// DisappearingMessagesConfiguration
try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
return try contentProto.build() return try contentProto.build()
} catch { } catch {
SNLog("Couldn't construct unsend request proto from: \(self).") SNLog("Couldn't construct unsend request proto from: \(self).")

Loading…
Cancel
Save