Fetch latest group data on unblock of a group

signalapp · Jun 20, 2022 · d547ef3 · d547ef3
1 parent 7dd9cab
commit d547ef3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -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();
   }