Set disappearing check timer reliably - on all message saves

js/modules/backup.js

@@ -1003,13 +1003,9 @@ async function saveAllMessages(db, rawMessages) {
 
     const { conversationId } = messages[0];
 
-    for (let index = 0, max = messages.length; index < max; index += 1) {
-      // Yes, we really want to do these in order
-      // eslint-disable-next-line no-await-in-loop
-      await window.Signal.Data.saveMessage(messages[index], {
-        forceSave: true,
-      });
-    }
+    await window.Signal.Data.saveMessages(messages, {
+      forceSave: true,
+    });
 
     window.log.info(
       'Saved',

js/modules/data.js

@@ -201,8 +201,9 @@ async function removeDB() {
   await channels.removeDB();
 }
 
-async function saveMessage(data, { forceSave } = {}) {
+async function saveMessage(data, { forceSave, Message } = {}) {
   const id = await channels.saveMessage(_cleanData(data), { forceSave });
+  Message.refreshExpirationTimer();
   return id;
 }
 

js/modules/debug.js

@@ -1,5 +1,5 @@
 /* eslint-env node */
-/* global log, Signal */
+/* global log, Signal, Whisper */
 
 const fs = require('fs-extra');
 const path = require('path');
@@ -59,7 +59,7 @@ exports.createConversation = async ({
       await sleep(index * 100);
       log.info(`Create message ${index + 1}`);
       const message = await createRandomMessage({ conversationId });
-      return Signal.Data.saveMessage(message);
+      return Signal.Data.saveMessage(message, { Message: Whisper.Message });
     })
   );
 };