From 9b3d36f93ec832dc96082a509fe468799a9629b0 Mon Sep 17 00:00:00 2001
From: Daniel Lugo <danlugo92@gmail.com>
Date: Wed, 8 Apr 2020 11:29:40 -0400
Subject: [PATCH] transmit new message id on creation

---
 services/gunDB/Mediator/index.js      | 9 ++++++---
 services/gunDB/contact-api/actions.js | 7 ++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/services/gunDB/Mediator/index.js b/services/gunDB/Mediator/index.js
index 43627866..abce3c6f 100644
--- a/services/gunDB/Mediator/index.js
+++ b/services/gunDB/Mediator/index.js
@@ -750,11 +750,14 @@ class Mediator {
 
       await throwOnInvalidToken(token)
 
-      await API.Actions.sendMessage(recipientPublicKey, body, user, mySEA)
-
       this.socket.emit(Action.SEND_MESSAGE, {
         ok: true,
-        msg: null,
+        msg: await API.Actions.sendMessage(
+          recipientPublicKey,
+          body,
+          user,
+          mySEA
+        ),
         origBody: reqBody
       })
     } catch (err) {
diff --git a/services/gunDB/contact-api/actions.js b/services/gunDB/contact-api/actions.js
index 9ddb0502..25155229 100644
--- a/services/gunDB/contact-api/actions.js
+++ b/services/gunDB/contact-api/actions.js
@@ -633,11 +633,12 @@ const sendHandshakeRequest = async (recipientPublicKey, gun, user, SEA) => {
 }
 
 /**
+ * Returns the message id.
  * @param {string} recipientPublicKey
  * @param {string} body
  * @param {UserGUNNode} user
  * @param {ISEA} SEA
- * @returns {Promise<void>}
+ * @returns {Promise<string>} The message id.
  */
 const sendMessage = async (recipientPublicKey, body, user, SEA) => {
   if (!user.is) {
@@ -689,7 +690,7 @@ const sendMessage = async (recipientPublicKey, body, user, SEA) => {
   }
 
   return new Promise((res, rej) => {
-    user
+    const msgNode = user
       .get(Key.OUTGOINGS)
       .get(outgoingID)
       .get(Key.MESSAGES)
@@ -697,7 +698,7 @@ const sendMessage = async (recipientPublicKey, body, user, SEA) => {
         if (ack.err) {
           rej(new Error(ack.err))
         } else {
-          res()
+          res(msgNode._.get)
         }
       })
   })