From f68fbb05f9d63f862d2b71f368a8b434d52d9111 Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 3 Apr 2023 14:09:06 +0200 Subject: [PATCH] fix: resolve turning off disappearing messages empty messages in most cases still requires more tweaking --- ts/node/migration/sessionMigrations.ts | 2 +- ts/util/expiringMessages.ts | 10 ++++++---- ts/util/releaseFeature.ts | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index 067643e5b..af934f55c 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -1226,7 +1226,7 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite db.prepare(`ALTER TABLE ${CONVERSATIONS_TABLE} ADD COLUMN hasOutdatedClient TEXT;`).run(); // TODO update to agreed value between platforms - const disappearingMessagesV2ReleaseTimestamp = 1680339600000; // unix 01/04/2023 09:00 + const disappearingMessagesV2ReleaseTimestamp = 1706778000000; // unix 01/02/2024 09:00 // const disappearingMessagesV2ReleaseTimestamp = 1677488400000; // unix 27/02/2023 09:00 // support disppearing messages legacy mode until after the platform agreed timestamp diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts index ad451d12c..06055bda0 100644 --- a/ts/util/expiringMessages.ts +++ b/ts/util/expiringMessages.ts @@ -290,10 +290,12 @@ export async function checkForExpireUpdate( const isLegacyDataMessage = Boolean( isLegacyContentMessage && checkIsLegacyDataMessage(dataMessage as SignalService.DataMessage) ); - const isLegacyConversationSettingMessage = - isLegacyContentMessage && - isLegacyDataMessage && - dataMessage.flags === SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE; + const isLegacyConversationSettingMessage = isDisappearingMessagesV2Released + ? isLegacyContentMessage && + isLegacyDataMessage && + dataMessage.flags === SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE + : isLegacyContentMessage && + dataMessage.flags === SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE; let expirationTimer = isLegacyDataMessage ? Number(dataMessage.expireTimer) diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts index abc080831..97c8d1422 100644 --- a/ts/util/releaseFeature.ts +++ b/ts/util/releaseFeature.ts @@ -1,7 +1,7 @@ import { Data } from '../data/data'; // TODO update to agreed value between platforms -const featureReleaseTimestamp = 1680339600000; // unix 01/04/2023 09:00 +const featureReleaseTimestamp = 1706778000000; // unix 01/02/2024 09:00 // const featureReleaseTimestamp = 1677488400000; // unix 27/02/2023 09:00 let isFeatureReleased: boolean | undefined;