remove uneeded passing of models to Data calls

js/background.js

@@ -285,9 +285,7 @@
         if (conversation) {
           conversation.removeMessage(id);
         }
-        window.Signal.Data.removeMessage(id, {
+        window.Signal.Data.removeMessage(id);
-          Message: window.models.Message.MessageModel,
-        });
       });
     }
   );
@@ -305,9 +303,7 @@
     window.log.info('Cleanup: starting...');
 
     const results = await Promise.all([
-      window.Signal.Data.getOutgoingWithoutExpiresAt({
+      window.Signal.Data.getOutgoingWithoutExpiresAt(),
-        MessageCollection: window.models.Message.MessageCollection,
-      }),
     ]);
 
     // Combine the models
@@ -344,9 +340,7 @@
         }
 
         window.log.info(`Cleanup: Deleting unsent message ${sentAt}`);
-        await window.Signal.Data.removeMessage(message.id, {
+        await window.Signal.Data.removeMessage(message.id);
-          Message: window.models.Message.MessageModel,
-        });
       })
     );
     window.log.info('Cleanup: complete');

js/delivery_receipts.js

@@ -62,10 +62,7 @@
     async onReceipt(receipt) {
       try {
         const messages = await window.Signal.Data.getMessagesBySentAt(
-          receipt.get('timestamp'),
+          receipt.get('timestamp')
-          {
-            MessageCollection: window.models.Message.MessageCollection,
-          }
         );
 
         const message = await this.getTargetMessage(

js/expiring_messages.js

@@ -16,9 +16,7 @@
   async function destroyExpiredMessages() {
     try {
       window.log.info('destroyExpiredMessages: Loading messages...');
-      const messages = await window.Signal.Data.getExpiredMessages({
+      const messages = await window.Signal.Data.getExpiredMessages();
-        MessageCollection: window.models.Message.MessageCollection,
-      });
 
       await Promise.all(
         messages.map(async fromDB => {
@@ -30,9 +28,7 @@
 
           // We delete after the trigger to allow the conversation time to process
           //   the expiration before the message is removed from the database.
-          await window.Signal.Data.removeMessage(message.id, {
+          await window.Signal.Data.removeMessage(message.id);
-            Message: window.models.Message.MessageModel,
-          });
 
           Whisper.events.trigger('messageExpired', {
             conversationKey: message.attributes.conversationId,
@@ -59,9 +55,7 @@
   let timeout;
   async function checkExpiringMessages() {
     // Look up the next expiring message and set a timer to destroy it
-    const messages = await window.Signal.Data.getNextExpiringMessage({
+    const messages = await window.Signal.Data.getNextExpiringMessage();
-      MessageCollection: window.models.Message.MessageCollection,
-    });
 
     const next = messages.at(0);
     if (!next) {

js/modules/attachment_downloads.js

@@ -142,9 +142,7 @@ async function _runJob(job) {
       );
     }
 
-    const found = await getMessageById(messageId, {
+    const found = await getMessageById(messageId);
-      Message: models.Message.MessageModel,
-    });
     if (!found) {
       logger.error('_runJob: Source message not found, deleting job');
       await _finishJob(null, id);
@@ -226,9 +224,7 @@ async function _runJob(job) {
 
 async function _finishJob(message, id) {
   if (message) {
-    await saveMessage(message.attributes, {
+    await saveMessage(message.attributes);
-      Message: models.Message.MessageModel,
-    });
     const conversation = message.getConversation();
     if (conversation) {
       message.commit();

js/modules/backup.js

@@ -193,9 +193,7 @@ async function importConversationsFromJSON(conversations, options) {
       }
     );
     // eslint-disable-next-line no-await-in-loop
-    await window.Signal.Data.saveConversation(migrated, {
+    await window.Signal.Data.saveConversation(migrated);
-      Conversation: window.models.Conversation.ConversationModel,
-    });
   }
 
   window.log.info(
@@ -693,7 +691,6 @@ async function exportConversation(conversation, options = {}) {
       {
         limit: CHUNK_SIZE,
         receivedAt: lastReceivedAt,
-        MessageCollection: window.models.Message.MessageCollection,
       }
     );
     const messages = getPlainJS(collection);

js/modules/loki_app_dot_net_api.js

@@ -2019,9 +2019,7 @@ class LokiPublicChannelAPI {
       payload.annotations[0].value.quote = quote;
 
       // copied from model/message.js copyFromQuotedMessage
-      const collection = await Signal.Data.getMessagesBySentAt(quote.id, {
+      const collection = await Signal.Data.getMessagesBySentAt(quote.id);
-        MessageCollection: window.models.Message.MessageCollection,
-      });
       const found = collection.find(item => {
         const messageAuthor = item.getContact();
 

js/read_receipts.js

@@ -62,10 +62,7 @@
     async onReceipt(receipt) {
       try {
         const messages = await window.Signal.Data.getMessagesBySentAt(
-          receipt.get('timestamp'),
+          receipt.get('timestamp')
-          {
-            MessageCollection: window.models.Message.MessageCollection,
-          }
         );
 
         const message = await this.getTargetMessage(

js/read_syncs.js

@@ -28,10 +28,7 @@
     async onReceipt(receipt) {
       try {
         const messages = await window.Signal.Data.getMessagesBySentAt(
-          receipt.get('timestamp'),
+          receipt.get('timestamp')
-          {
-            MessageCollection: window.models.Message.MessageCollection,
-          }
         );
 
         const found = messages.find(

test/backup_test.js

@@ -495,9 +495,7 @@ describe('Backup', () => {
 
         console.log('Backup test: Create models, save to db/disk');
         const message = await upgradeMessageSchema(messageWithAttachments);
-        await window.Signal.Data.saveMessage(message, {
+        await window.Signal.Data.saveMessage(message);
-          Message: window.models.Message.MessageModel,
-        });
 
         const conversation = {
           active_at: 1524185933350,
@@ -518,9 +516,7 @@ describe('Backup', () => {
           version: 2,
         };
         console.log({ conversation });
-        await window.Signal.Data.saveConversation(conversation, {
+        await window.Signal.Data.saveConversation(conversation);
-          Conversation: window.models.Conversation.ConversationModel,
-        });
 
         console.log(
           'Backup test: Ensure that all attachments were saved to disk'
@@ -579,9 +575,7 @@ describe('Backup', () => {
         );
 
         console.log('Backup test: Check messages');
-        const messageCollection = await window.Signal.Data.getAllMessages({
+        const messageCollection = await window.Signal.Data.getAllMessages();
-          MessageCollection: window.models.Message.MessageCollection,
-        });
         assert.strictEqual(messageCollection.length, MESSAGE_COUNT);
         const messageFromDB = removeId(messageCollection.at(0).attributes);
         const expectedMessage = messageFromDB;

test/fixtures.js

@@ -234,9 +234,7 @@ Whisper.Fixtures = () => {
   conversationCollection.saveAll = function thisNeeded() {
     Promise.all(
       this.map(async (convo) => {
-        await window.Signal.Data.saveConversation(convo.attributes, {
+        await window.Signal.Data.saveConversation(convo.attributes);
-          Conversation: window.models.Conversation.ConversationModel,
-        });
 
         await Promise.all(
           convo.messageCollection.map(async (message) => {

ts/state/ducks/conversations.ts

@@ -560,14 +560,12 @@ function handleMessageChanged(
     const updatedWithFirstMessageOfSeries = updateFirstMessageOfSeries(
       sortedMessage
     );
-    console.timeEnd('handleMessageChanged' + payload.id);
 
     return {
       ...state,
       messages: updatedWithFirstMessageOfSeries,
     };
   }
-  console.timeEnd('handleMessageChanged' + payload.id);
 
   return state;
 }
@@ -577,7 +575,6 @@ function handleMessagesChanged(
   action: MessagesChangedActionType
 ) {
   const { payload } = action;
-  console.time('handleMessagesChanged' + payload.length);
 
   payload.forEach(element => {
     // tslint:disable-next-line: no-parameter-reassignment
@@ -587,8 +584,6 @@ function handleMessagesChanged(
     });
   });
 
-  console.timeEnd('handleMessagesChanged' + payload.length);
-
   return state;
 }