From f31e157c12a5e33233957ee2df3278ecc92132c8 Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 2 Oct 2023 14:22:49 +1100 Subject: [PATCH] refactor: replaced get expireTimer calls with getExpireTimer --- ts/models/conversation.ts | 12 ++++++------ ts/receiver/configMessage.ts | 6 +++--- ts/receiver/contentMessage.ts | 2 +- ts/session/group/closed-group.ts | 10 +++++----- ts/session/utils/calling/CallManager.ts | 6 +++--- .../utils/libsession/libsession_utils_contacts.ts | 2 +- .../utils/libsession/libsession_utils_user_groups.ts | 2 +- .../libsession/libsession_utils_user_profile.ts | 2 +- ts/util/expiringMessages.ts | 8 ++++---- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 576fe1e69..717ce4522 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -363,8 +363,8 @@ export class ConversationModel extends Backbone.Model { if (this.get('isApproved')) { toRet.isApproved = this.get('isApproved'); } - if (this.get('expireTimer')) { - toRet.expireTimer = this.get('expireTimer'); + if (this.getExpireTimer()) { + toRet.expireTimer = this.getExpireTimer(); } // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB if (this.isClosedGroup()) { @@ -756,10 +756,10 @@ export class ConversationModel extends Backbone.Model { sent_at: networkTimestamp, expirationType: changeToDisappearingMessageType( this, - this.get('expireTimer'), + this.getExpireTimer(), this.getExpirationMode() ), - expireTimer: this.get('expireTimer'), + expireTimer: this.getExpireTimer(), serverTimestamp: this.isPublic() ? networkTimestamp : undefined, groupInvitation, }); @@ -850,7 +850,7 @@ export class ConversationModel extends Backbone.Model { // Compare mode and timestamp if ( isEqual(expirationMode, this.getExpirationMode()) && - isEqual(expireTimer, this.get('expireTimer')) + isEqual(expireTimer, this.getExpireTimer()) ) { window.log.info( `WIP: conversation: updateExpireTimer() Ignoring ExpireTimerUpdate ${ @@ -1091,7 +1091,7 @@ export class ConversationModel extends Backbone.Model { * * (if there is an expireTimer, we do it the slow way, handling each message separately) */ - const expireTimerSet = !!this.get('expireTimer'); + const expireTimerSet = !!this.getExpireTimer(); const isOpenGroup = this.isOpenGroupV2(); if (isOpenGroup || !expireTimerSet) { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 00998e73e..5715ecd12 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -226,7 +226,7 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise 0 + foundConvo.getExpireTimer() > 0 ) { const messages2Expire = await Data.getDisappearingUnreadByConversation( convoId, diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index b7caf9399..e4b0cd194 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -873,7 +873,7 @@ export async function handleDataExtractionNotification( const referencedAttachmentTimestamp = toNumber(referencedAttachment); const expirationMode = convo.getExpirationMode(); - const expireTimer = convo.get('expireTimer'); + const expireTimer = convo.getExpireTimer(); let expirationType; let expirationStartTimestamp; diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index f843b91f9..9e7f7a96b 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -74,7 +74,7 @@ export async function initiateClosedGroupUpdate( const expirationType = changeToDisappearingMessageType( convo, - convo.get('expireTimer'), + convo.getExpireTimer(), convo.getExpirationMode() ); @@ -92,7 +92,7 @@ export async function initiateClosedGroupUpdate( zombies: convo.get('zombies')?.filter(z => members.includes(z)), activeAt: Date.now(), expirationType, - expireTimer: convo.get('expireTimer'), + expireTimer: convo.getExpireTimer(), }; const diff = buildGroupDiff(convo, groupDetails); @@ -174,14 +174,14 @@ export async function addUpdateMessage( } const expirationMode = convo.getExpirationMode(); - const expireTimer = convo.get('expireTimer'); + const expireTimer = convo.getExpireTimer(); let expirationType; let expirationStartTimestamp; if (convo && expirationMode && expireTimer > 0) { expirationType = expirationMode !== 'off' - ? changeToDisappearingMessageType(convo, convo.get('expireTimer'), expirationMode) + ? changeToDisappearingMessageType(convo, expireTimer, expirationMode) : undefined; // NOTE Trigger for an incoming message @@ -317,7 +317,7 @@ async function sendAddedMembers( const encryptionKeyPair = ECKeyPair.fromHexKeyPair(hexEncryptionKeyPair); const expirationMode = convo.getExpirationMode() || 'off'; - const existingExpireTimer = convo.get('expireTimer') || 0; + const existingExpireTimer = convo.getExpireTimer() || 0; // Send the Added Members message to the group (only members already in the group will get it) const closedGroupControlMessage = new ClosedGroupAddedMembersMessage({ timestamp: Date.now(), diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 771704029..d7ac9ebc3 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -517,7 +517,7 @@ export async function USER_callRecipient(recipient: string) { weAreCallerOnCurrentCall = true; const expirationMode = calledConvo.getExpirationMode(); - const expireTimer = calledConvo.get('expireTimer') || 0; + const expireTimer = calledConvo.getExpireTimer() || 0; let expirationType; let expirationStartTimestamp; @@ -902,7 +902,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) { await callerConvo.unhideIfNeeded(false); const expirationMode = callerConvo.getExpirationMode(); - const expireTimer = callerConvo.get('expireTimer') || 0; + const expireTimer = callerConvo.getExpireTimer() || 0; let expirationType; let expirationStartTimestamp; @@ -1259,7 +1259,7 @@ async function addMissedCallMessage(callerPubkey: string, sentAt: number) { } const expirationMode = incomingCallConversation.getExpirationMode(); - const expireTimer = incomingCallConversation.get('expireTimer') || 0; + const expireTimer = incomingCallConversation.getExpireTimer() || 0; let expirationType; let expirationStartTimestamp; diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index 8b9df5c38..522580e64 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -55,7 +55,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise