From d4aacd3159b25be7070f4ccd5590a56963613dd9 Mon Sep 17 00:00:00 2001 From: William Grant Date: Fri, 13 Oct 2023 12:08:45 +1100 Subject: [PATCH] fix: move isDelete into inbox poll if statement fixed some comments --- ts/receiver/contentMessage.ts | 2 +- ts/receiver/dataMessage.ts | 2 +- ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts | 3 +-- ts/session/group/closed-group.ts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 6ea73a05d..d5b033e26 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -883,7 +883,7 @@ export async function handleDataExtractionNotification( ? changeToDisappearingMessageType(convo, expireTimer, expirationMode) : undefined; - // NOTE Trigger for an incoming message + // NOTE Triggers disappearing for an incoming DataExtractionNotification message // TODO legacy messages support will be removed in a future release if (expirationMode === 'legacy' || expirationMode === 'deleteAfterSend') { expirationStartTimestamp = setExpirationStartTimestamp( diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index d07c0ddc1..7bbf2c5eb 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -113,7 +113,7 @@ export function cleanIncomingDataMessage( if (rawDataMessage.flags == null) { rawDataMessage.flags = 0; } - // TODO This should be removed 2 weeks after the release + // TODO legacy messages support will be removed in a future release if (rawDataMessage.expireTimer == null) { rawDataMessage.expireTimer = 0; } diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts index 12a8cd5ab..90cdf6067 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts @@ -257,8 +257,7 @@ const makeBatchRequestPayload = ( break; case 'inbox': - const isDelete = Boolean(options.inbox?.type === 'delete'); - if (isDelete) { + if (options.inbox?.type === 'delete') { return { method: 'DELETE', path: '/inbox', diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 46b6251c4..e984ed33d 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -184,7 +184,7 @@ export async function addUpdateMessage( ? changeToDisappearingMessageType(convo, expireTimer, expirationMode) : undefined; - // NOTE Trigger for an incoming message + // NOTE Triggers disappearing for an incoming groupUpdate message // TODO legacy messages support will be removed in a future release if (expirationMode === 'legacy' || expirationMode === 'deleteAfterSend') { expirationStartTimestamp = setExpirationStartTimestamp(