refactor: replaced get lastDisappearingMessageChangeTimestamp calls

with getLastDisappearingMessageChangeTimestamp
pull/2971/head
William Grant 2 years ago
parent 712a1e92e4
commit 1861131ce2

@ -331,7 +331,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
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<ConversationAttributes> {
}
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',

@ -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

Loading…
Cancel
Save