diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts index 56941a6fb..5593d7391 100644 --- a/ts/models/conversations.ts +++ b/ts/models/conversations.ts @@ -971,6 +971,8 @@ export class ConversationModel extends window.Backbone if (!viaStorageServiceSync) { this.captureChange('unblock'); } + + this.fetchLatestGroupV2Data({ force: true }); } return unblocked; diff --git a/ts/services/expiringMessagesDeletion.ts b/ts/services/expiringMessagesDeletion.ts index 8ea3417c2..d83c8fc72 100644 --- a/ts/services/expiringMessagesDeletion.ts +++ b/ts/services/expiringMessagesDeletion.ts @@ -2,8 +2,11 @@ // SPDX-License-Identifier: AGPL-3.0-only import { debounce } from 'lodash'; + import type { MessageModel } from '../models/messages'; import { clearTimeoutIfNecessary } from '../util/clearTimeoutIfNecessary'; +import { sleep } from '../util/sleep'; +import { SECOND } from '../util/durations'; class ExpiringMessagesDeletionService { public update: typeof this.checkExpiringMessages; @@ -60,9 +63,15 @@ class ExpiringMessagesDeletionService { 'destroyExpiredMessages: Error deleting expired messages', error && error.stack ? error.stack : error ); + window.SignalContext.log.info( + 'destroyExpiredMessages: Waiting 30 seconds before trying again' + ); + await sleep(30 * SECOND); } - window.SignalContext.log.info('destroyExpiredMessages: complete'); + window.SignalContext.log.info( + 'destroyExpiredMessages: done, scheduling another check' + ); this.update(); }