Prepare to delete message, send message id to server

js/models/conversations.js

@@ -1357,6 +1357,7 @@
         options.messageType = message.get('type');
         if (this.isPublic()) {
           options.publicEndpoint = this.getEndpoint();
+          options.messageId = id;
         }
 
         const groupNumbers = this.getRecipients();

js/models/messages.js

@@ -357,6 +357,9 @@
     onDestroy() {
       this.cleanup();
     },
+    deleteMessage() {
+      this.trigger('delete', this);
+    },
     async cleanup() {
       MessageController.unregister(this.id);
       this.unload();

js/modules/loki_message_api.js

@@ -80,6 +80,7 @@ class LokiMessageAPI {
       isPing = false,
       numConnections = DEFAULT_CONNECTIONS,
       publicEndpoint = null,
+      messageId = null,
     } = options;
     // Data required to identify a message in a conversation
     const messageEventData = {
@@ -105,6 +106,7 @@ class LokiMessageAPI {
               timestamp: messageTimeStamp,
               from: displayName,
               source: this.ourKey,
+              id: messageId,
             },
           },
         ],

libtextsecure/outgoing_message.js

@@ -50,10 +50,12 @@ function OutgoingMessage(
     messageType,
     isPing,
     publicEndpoint,
+    messageId,
   } =
     options || {};
   this.numberInfo = numberInfo;
   this.publicEndpoint = publicEndpoint;
+  this.messageId = messageId;
   this.senderCertificate = senderCertificate;
   this.online = online;
   this.messageType = messageType || 'outgoing';
@@ -203,6 +205,7 @@ OutgoingMessage.prototype = {
       };
       if (this.publicEndpoint) {
         options.publicEndpoint = this.publicEndpoint;
+        options.messageId = this.messageId;
       }
       await lokiMessageAPI.sendMessage(pubKey, data, timestamp, ttl, options);
     } catch (e) {