fix closed group default disappearing messages settings

pull/731/head
Ryan Zhao 9 months ago
parent 66e37cef07
commit 77ceac54e0

@ -97,7 +97,7 @@ public extension DisappearingMessagesConfiguration {
return DisappearingMessagesConfiguration( return DisappearingMessagesConfiguration(
threadId: threadId, threadId: threadId,
isEnabled: false, isEnabled: false,
durationSeconds: DefaultDuration.unknown.seconds, durationSeconds: 0,
type: .unknown, type: .unknown,
lastChangeTimestampMs: 0 lastChangeTimestampMs: 0
) )

@ -64,7 +64,8 @@ public class Message: Codable {
return return
} }
proto.setExpirationTimer(UInt32(disappearingMessagesConfiguration.durationSeconds)) let expireTimer: UInt32 = disappearingMessagesConfiguration.isEnabled ? UInt32(disappearingMessagesConfiguration.durationSeconds) : 0
proto.setExpirationTimer(expireTimer)
proto.setLastDisappearingMessageChangeTimestamp(UInt64(disappearingMessagesConfiguration.lastChangeTimestampMs ?? 0)) proto.setLastDisappearingMessageChangeTimestamp(UInt64(disappearingMessagesConfiguration.lastChangeTimestampMs ?? 0))
if disappearingMessagesConfiguration.isEnabled, let type = disappearingMessagesConfiguration.type { if disappearingMessagesConfiguration.isEnabled, let type = disappearingMessagesConfiguration.type {

@ -190,10 +190,10 @@ extension MessageReceiver {
.defaulting(to: DisappearingMessagesConfiguration.defaultWith(thread.id)) .defaulting(to: DisappearingMessagesConfiguration.defaultWith(thread.id))
.with( .with(
isEnabled: (expirationTimer > 0), isEnabled: (expirationTimer > 0),
durationSeconds: TimeInterval(expirationTimer > 0 ? durationSeconds: (expirationTimer > 0) ?
expirationTimer : TimeInterval(expirationTimer) :
(24 * 60 * 60) DisappearingMessagesConfiguration.DefaultDuration.disappearAfterSend.seconds,
) type: .disappearAfterSend
) )
.saved(db) .saved(db)

Loading…
Cancel
Save