fix: ignore equal lastMessageChangeTimestamps

pull/2971/head
William Grant 2 years ago
parent 3ba1baaa67
commit 3d8a664da9

@ -840,7 +840,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
if ( if (
this.get('lastDisappearingMessageChangeTimestamp') && this.get('lastDisappearingMessageChangeTimestamp') &&
lastDisappearingMessageChangeTimestamp && lastDisappearingMessageChangeTimestamp &&
this.get('lastDisappearingMessageChangeTimestamp') > lastDisappearingMessageChangeTimestamp this.get('lastDisappearingMessageChangeTimestamp') >= lastDisappearingMessageChangeTimestamp
) { ) {
window.log.info( window.log.info(
'WIP: updateExpireTimer() This is an outdated disappearing message setting', 'WIP: updateExpireTimer() This is an outdated disappearing message setting',

@ -436,7 +436,7 @@ export async function handleMessageJob(
window.log.debug( window.log.debug(
`WIP: There is a problem with the expiration timer update.\nmessage model: ${JSON.stringify( `WIP: There is a problem with the expiration timer update.\nmessage model: ${JSON.stringify(
messageModel messageModel
)}\nexpirationTimerUpdte: ${JSON.stringify(expirationTimerUpdate)}` )}\nexpirationTimerUpdate: ${JSON.stringify(expirationTimerUpdate)}`
); );
return; return;
} }
@ -454,7 +454,7 @@ export async function handleMessageJob(
window.log.debug( window.log.debug(
`WIP: There is a problem with the expiration timer update. The lastDisappearingMessageChangeTimestamp is missing.\nmessage model: ${JSON.stringify( `WIP: There is a problem with the expiration timer update. The lastDisappearingMessageChangeTimestamp is missing.\nmessage model: ${JSON.stringify(
messageModel messageModel
)}\nexpirationTimerUpdte: ${JSON.stringify(expirationTimerUpdate)}` )}\nexpirationTimerUpdate: ${JSON.stringify(expirationTimerUpdate)}`
); );
return; return;
} }

@ -427,11 +427,11 @@ export async function checkForExpireUpdateInContentMessage(
if ( if (
convoToUpdate.get('lastDisappearingMessageChangeTimestamp') && convoToUpdate.get('lastDisappearingMessageChangeTimestamp') &&
lastDisappearingMessageChangeTimestamp && lastDisappearingMessageChangeTimestamp &&
convoToUpdate.get('lastDisappearingMessageChangeTimestamp') > convoToUpdate.get('lastDisappearingMessageChangeTimestamp') >=
lastDisappearingMessageChangeTimestamp lastDisappearingMessageChangeTimestamp
) { ) {
window.log.info( window.log.info(
`WIP: checkForExpireUpdateInContentMessage() This is an outdated disappearing message setting.\ncontent: ${JSON.stringify( `WIP: checkForExpireUpdateInContentMessage() This is an outdated disappearing message setting. So we will ignore it.\ncontent: ${JSON.stringify(
content content
)}\n\nconvoToUpdate: ${JSON.stringify(convoToUpdate)}` )}\n\nconvoToUpdate: ${JSON.stringify(convoToUpdate)}`
); );

Loading…
Cancel
Save