From 0dcf48be160964c83cc8b6cd29ec57485d66371f Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 2 Oct 2023 14:45:08 +1100 Subject: [PATCH] refactor: replaced get expires_at calls with getExpiresAt --- ts/models/message.ts | 2 +- ts/util/expiringMessages.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/models/message.ts b/ts/models/message.ts index a103cecba..df3cefc8e 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -1162,7 +1162,7 @@ export class MessageModel extends Backbone.Model { } public async setToExpire() { - if (this.isExpiring() && !this.get('expires_at')) { + if (this.isExpiring() && !this.getExpiresAt()) { const start = this.getExpirationStartTimestamp(); const delta = this.getExpireTimer() * 1000; if (!start) { diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts index ea97f0644..869d06f83 100644 --- a/ts/util/expiringMessages.ts +++ b/ts/util/expiringMessages.ts @@ -128,7 +128,7 @@ async function checkExpiringMessages() { return; } - const expiresAt = next.get('expires_at'); + const expiresAt = next.getExpiresAt(); if (!expiresAt) { return; } @@ -670,7 +670,7 @@ export async function updateMessageExpiryOnSwarm( expireTimer: message.getExpireTimer() * 1000, shorten: true, }); - const expiresAt = message.get('expires_at'); + const expiresAt = message.getExpiresAt(); if (newTTL && newTTL !== expiresAt) { message.set({