fix: disappear synced settings updates

need to trigger the expirationStartTimestamp manually
pull/2971/head
William Grant 2 years ago
parent 674cda3278
commit 5b7afe0a29

@ -120,6 +120,7 @@ import {
import { import {
DisappearingMessageConversationModeType, DisappearingMessageConversationModeType,
changeToDisappearingMessageType, changeToDisappearingMessageType,
setExpirationStartTimestamp,
} from '../util/expiringMessages'; } from '../util/expiringMessages';
import { markAttributesAsReadIfNeeded } from './messageFactory'; import { markAttributesAsReadIfNeeded } from './messageFactory';
@ -932,8 +933,17 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
// if change was made remotely, don't send it to the contact/group // if change was made remotely, don't send it to the contact/group
if (receivedAt || fromSync) { if (receivedAt || fromSync) {
window.log.debug( window.log.debug(
`WIP: updateExpireTimer() We dont send an ExpireTimerUpdate because this was a remote change receivedAt:${receivedAt} fromSync:${fromSync}` `WIP: updateExpireTimer() We dont send an ExpireTimerUpdate because this was a remote change receivedAt: ${receivedAt} fromSync: ${fromSync}`
); );
if (expirationMode !== 'off' && !message.getExpirationStartTimestamp()) {
message.set({
expirationStartTimestamp: setExpirationStartTimestamp(
expirationMode,
message.get('sent_at'),
'updateExpireTimer() remote change'
),
});
}
return; return;
} }

Loading…
Cancel
Save