rename all saveMessage to message.commit()

js/delivery_receipts.js

@@ -102,9 +102,7 @@
           // This will save the message for us while starting the timer
           await message.setToExpire();
         } else {
-          await window.Signal.Data.saveMessage(message.attributes, {
-            Message: Whisper.Message,
-          });
+          await message.commit();
         }
 
         // notify frontend listeners

js/models/conversations.js

@@ -858,9 +858,7 @@
         unread: 1,
       };
 
-      const id = await window.Signal.Data.saveMessage(message, {
-        Message: Whisper.Message,
-      });
+      const id = await message.commit();
 
       this.trigger(
         'newmessage',
@@ -911,9 +909,7 @@
         unread: 1,
       };
 
-      const id = await window.Signal.Data.saveMessage(message, {
-        Message: Whisper.Message,
-      });
+      const id = await message.commit();
 
       this.trigger(
         'newmessage',
@@ -1192,10 +1188,7 @@
         const model = this.addSingleMessage(attributes);
         const message = MessageController.register(model.id, model);
 
-        await window.Signal.Data.saveMessage(message.attributes, {
-          forceSave: true,
-          Message: Whisper.Message,
-        });
+        await message.commit(true);
 
         if (this.isPrivate()) {
           message.set({ destination });
@@ -1204,9 +1197,7 @@
           message.setServerTimestamp(new Date().getTime());
         }
 
-        const id = await window.Signal.Data.saveMessage(message.attributes, {
-          Message: Whisper.Message,
-        });
+        const id = await message.commit();
         message.set({ id });
 
         this.set({
@@ -1470,9 +1461,8 @@
         message.set({ recipients: this.getRecipients() });
       }
 
-      const id = await window.Signal.Data.saveMessage(message.attributes, {
-        Message: Whisper.Message,
-      });
+      const id = await message.commit();
+
       message.set({ id });
       await this.commit();
 
@@ -1576,9 +1566,7 @@
         ...attributes,
       });
 
-      const id = await window.Signal.Data.saveMessage(message.attributes, {
-        Message: Whisper.Message,
-      });
+      const id = await message.commit();
       message.set({ id });
       return message;
     },
@@ -1644,12 +1632,7 @@
     async addMessage(messageAttributes) {
       const message = this.messageCollection.add(messageAttributes);
 
-      const messageId = await window.Signal.Data.saveMessage(
-        message.attributes,
-        {
-          Message: Whisper.Message,
-        }
-      );
+      const messageId = await message.commit();
       message.set({ id: messageId });
       return message;
     },
@@ -1726,9 +1709,7 @@
           received_at: now,
         });
 
-        const id = await window.Signal.Data.saveMessage(message.attributes, {
-          Message: Whisper.Message,
-        });
+        const id = await message.commit();
         message.set({ id });
 
         // FIXME what about public groups?
@@ -2122,9 +2103,7 @@
           const upgradedMessage = await upgradeMessageSchema(attributes);
           message.set(upgradedMessage);
           // eslint-disable-next-line no-await-in-loop
-          await window.Signal.Data.saveMessage(upgradedMessage, {
-            Message: Whisper.Message,
-          });
+          await upgradedMessage.commit();
         }
       }
     },

js/models/messages.d.ts

@@ -54,6 +54,7 @@ export interface MessageModel extends Backbone.Model<MessageAttributes> {
   saveErrors: (error: any) => void;
   sendSyncMessageOnly: (message: any) => void;
   isUnread: () => boolean;
+  commit: () => Promise<number>;
 
   propsForMessage?: any;
   propsForTimerNotification?: any;

js/models/messages.js

@@ -1610,11 +1610,14 @@
       );
       return !!error;
     },
-    async commit() {
-      await window.Signal.Data.saveMessage(this.attributes, {
+    async commit(forceSave = false) {
+      // TODO investigate the meaning of the forceSave
+      const id = await window.Signal.Data.saveMessage(this.attributes, {
+        forceSave,
         Message: Whisper.Message,
       });
       this.trigger('change');
+      return id;
     },
     async markRead(readAt) {
       this.unset('unread');

js/modules/debug.js

@@ -57,7 +57,7 @@ exports.createConversation = async ({
       await sleep(index * 100);
       log.info(`Create message ${index + 1}`);
       const message = await createRandomMessage({ conversationId });
-      return Signal.Data.saveMessage(message, { Message: Whisper.Message });
+      return message.commit();
     })
   );
 };

js/read_receipts.js

@@ -101,9 +101,7 @@
           // This will save the message for us while starting the timer
           await message.setToExpire();
         } else {
-          await window.Signal.Data.saveMessage(message.attributes, {
-            Message: Whisper.Message,
-          });
+          await message.commit();
         }
 
         // notify frontend listeners

test/backup_test.js

@@ -488,9 +488,7 @@ describe('Backup', () => {
         console.log('Backup test: Create models, save to db/disk');
         const message = await upgradeMessageSchema(messageWithAttachments);
         console.log({ message });
-        await window.Signal.Data.saveMessage(message, {
-          Message: Whisper.Message,
-        });
+        await message.commit();
 
         const conversation = {
           active_at: 1524185933350,

test/fixtures.js

@@ -240,9 +240,7 @@ Whisper.Fixtures = () => {
 
         await Promise.all(
           convo.messageCollection.map(async (message) => {
-            const id = await window.Signal.Data.saveMessage(message.attributes, {
-              Message: Whisper.Message,
-            });
+            const id = await message.commit();
             message.set({ id });
           })
         );

test/models/conversations_test.js

@@ -46,9 +46,7 @@ describe('Conversation', () => {
       sent_at: Date.now(),
       received_at: Date.now(),
     });
-    await window.Signal.Data.saveMessage(message.attributes, {
-      Message: Whisper.Message,
-    });
+    await message.commit();
   });
   after(clearDatabase);
 

ts/components/session/conversation/SessionConversation.tsx

@@ -42,7 +42,6 @@ interface State {
 
   unreadCount: number;
   initialFetchComplete: boolean;
-  messages: Array<any>;
   selectedMessages: Array<string>;
   isScrolledToBottom: boolean;
   displayScrollToBottomButton: boolean;
@@ -69,6 +68,8 @@ interface Props {
   conversationKey: string;
   conversation: ConversationType;
   theme: DefaultTheme;
+  messages: Array<any>;
+  actions: any;
 }
 
 export class SessionConversation extends React.Component<Props, State> {

ts/components/session/conversation/SessionRightPanel.tsx

@@ -130,9 +130,7 @@ class SessionRightPanel extends React.Component<Props, State> {
           message
         );
         // eslint-disable-next-line no-await-in-loop
-        await window.Signal.Data.saveMessage(rawMedia[i], {
-          Message: window.Whisper.Message,
-        });
+        await rawMedia[i].commit();
       }
     }
 

ts/receiver/queuedJob.ts

@@ -145,9 +145,7 @@ async function copyFromQuotedMessage(
     // Normally the caller would save the message, but in case we are
     // called by a timer, we need to update the message manually
     msg.set({ quote });
-    await window.Signal.Data.saveMessage(msg.attributes, {
-      Message: Whisper.Message,
-    });
+    await msg.commit();
     return;
   }
 
@@ -166,9 +164,7 @@ async function copyFromQuotedMessage(
         queryMessage.attributes
       );
       queryMessage.set(upgradedMessage);
-      await window.Signal.Data.saveMessage(upgradedMessage, {
-        Message: Whisper.Message,
-      });
+      await upgradedMessage.commit();
     }
   } catch (error) {
     window.log.error(
@@ -554,9 +550,7 @@ export async function handleMessageJob(
 
     const { Whisper, MessageController } = window;
 
-    const id = await window.Signal.Data.saveMessage(message.attributes, {
-      Message: Whisper.Message,
-    });
+    const id = await message.commit();
     message.set({ id });
     MessageController.register(message.id, message);