refactor: replaced get expirationTimerUpdate calls

with getExpirationTimerUpdate
pull/2971/head
William Grant 2 years ago
parent 0dcf48be16
commit bb646ed3b9

@ -196,7 +196,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
public isExpirationTimerUpdate() { public isExpirationTimerUpdate() {
const expirationTimerFlag = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE; const expirationTimerFlag = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE;
const flags = this.get('flags') || 0; const flags = this.get('flags') || 0;
const expirationTimerUpdate = this.get('expirationTimerUpdate'); const expirationTimerUpdate = this.getExpirationTimerUpdate();
// eslint-disable-next-line no-bitwise // eslint-disable-next-line no-bitwise
return Boolean(flags & expirationTimerFlag) || !isEmpty(expirationTimerUpdate); return Boolean(flags & expirationTimerFlag) || !isEmpty(expirationTimerUpdate);
@ -260,7 +260,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
return window.i18n('mediaMessage'); return window.i18n('mediaMessage');
} }
if (this.isExpirationTimerUpdate()) { if (this.isExpirationTimerUpdate()) {
const expireTimerUpdate = this.get('expirationTimerUpdate'); const expireTimerUpdate = this.getExpirationTimerUpdate();
const expireTimer = expireTimerUpdate?.expireTimer; const expireTimer = expireTimerUpdate?.expireTimer;
const convo = this.getConversation(); const convo = this.getConversation();
if (!convo) { if (!convo) {
@ -326,7 +326,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
return null; return null;
} }
const timerUpdate = this.get('expirationTimerUpdate'); const timerUpdate = this.getExpirationTimerUpdate();
const convo = this.getConversation(); const convo = this.getConversation();
if (!timerUpdate || !timerUpdate.source || !convo) { if (!timerUpdate || !timerUpdate.source || !convo) {

@ -421,7 +421,7 @@ export async function handleMessageJob(
if (messageModel.isExpirationTimerUpdate()) { if (messageModel.isExpirationTimerUpdate()) {
// NOTE if we turn off disappearing messages from a legacy client expirationTimerUpdate can be undefined but the flags value is correctly set // NOTE if we turn off disappearing messages from a legacy client expirationTimerUpdate can be undefined but the flags value is correctly set
const expirationTimerUpdate = messageModel.get('expirationTimerUpdate'); const expirationTimerUpdate = messageModel.getExpirationTimerUpdate();
if ( if (
messageModel.get('flags') !== SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE && messageModel.get('flags') !== SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE &&
(!expirationTimerUpdate || isEmpty(expirationTimerUpdate)) (!expirationTimerUpdate || isEmpty(expirationTimerUpdate))

Loading…
Cancel
Save