diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index d1a1421e1..02892d012 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -331,7 +331,7 @@ export class ConversationModel extends Backbone.Model { toRet.expirationMode = this.getExpirationMode(); } - if (this.get('lastDisappearingMessageChangeTimestamp')) { + if (this.getLastDisappearingMessageChangeTimestamp()) { toRet.lastDisappearingMessageChangeTimestamp = this.get( 'lastDisappearingMessageChangeTimestamp' ); @@ -835,9 +835,9 @@ export class ConversationModel extends Backbone.Model { } if ( - this.get('lastDisappearingMessageChangeTimestamp') && + this.getLastDisappearingMessageChangeTimestamp() && lastDisappearingMessageChangeTimestamp && - this.get('lastDisappearingMessageChangeTimestamp') >= lastDisappearingMessageChangeTimestamp + this.getLastDisappearingMessageChangeTimestamp() >= lastDisappearingMessageChangeTimestamp ) { window.log.info( 'WIP: updateExpireTimer() This is an outdated disappearing message setting', diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts index b07780a55..be1284891 100644 --- a/ts/util/expiringMessages.ts +++ b/ts/util/expiringMessages.ts @@ -449,19 +449,19 @@ export async function checkForExpireUpdateInContentMessage( // NOTE if we are checking an outgoing content message then the conversation's lastDisappearingMessageChangeTimestamp has just been set to match the content message so it can't be outdated if equal if ( - convoToUpdate.get('lastDisappearingMessageChangeTimestamp') && + convoToUpdate.getLastDisappearingMessageChangeTimestamp() && lastDisappearingMessageChangeTimestamp && ((isOutgoing && - convoToUpdate.get('lastDisappearingMessageChangeTimestamp') > + convoToUpdate.getLastDisappearingMessageChangeTimestamp() > lastDisappearingMessageChangeTimestamp) || (!isOutgoing && - convoToUpdate.get('lastDisappearingMessageChangeTimestamp') >= + convoToUpdate.getLastDisappearingMessageChangeTimestamp() >= lastDisappearingMessageChangeTimestamp)) ) { window.log.info( `WIP: checkForExpireUpdateInContentMessage() This is an outdated ${ isOutgoing ? 'outgoing' : 'incoming' - } disappearing message setting. So we will ignore it.\nconvoToUpdate.get('lastDisappearingMessageChangeTimestamp'): ${convoToUpdate.get( + } disappearing message setting. So we will ignore it.\nconvoToUpdate.getLastDisappearingMessageChangeTimestamp(): ${convoToUpdate.get( 'lastDisappearingMessageChangeTimestamp' )}\nlastDisappearingMessageChangeTimestamp: ${lastDisappearingMessageChangeTimestamp}\n\ncontent: ${JSON.stringify( content