Merge pull request #4 from stakwork/sender-socket

sender socket
stakwork · Mar 30, 2020 · c8db0d9 · c8db0d9
2 parents 58d5c32 + afb2dbf
commit c8db0d9
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 33 deletions.
diff --git a/api/controllers/confirmations.ts b/api/controllers/confirmations.ts
@@ -45,7 +45,7 @@ export async function receiveConfirmation(payload) {
 				})
 				socket.sendJson({
 					type: 'confirmation',
-					response: jsonUtils.messageToJson(message, chat)
+					response: jsonUtils.messageToJson(message, chat, sender)
 				})
 			}
 			done()
@@ -71,7 +71,7 @@ export async function receiveConfirmation(payload) {
 
 		socket.sendJson({
 			type: 'confirmation',
-			response: jsonUtils.messageToJson(message, chat)
+			response: jsonUtils.messageToJson(message, chat, sender)
 		})
 	}
 }
diff --git a/api/controllers/invoices.ts b/api/controllers/invoices.ts
@@ -212,7 +212,7 @@ const receiveInvoice = async (payload) => {
 
   socket.sendJson({
     type: 'invoice',
-    response: jsonUtils.messageToJson(message, chat)
+    response: jsonUtils.messageToJson(message, chat, sender)
   })
 
   sendNotification(chat, sender.alias, 'message')

diff --git a/api/controllers/media.ts b/api/controllers/media.ts
@@ -185,7 +185,7 @@ const purchase = async (req, res) => {
     message: msg,
     success: async (data) => {
       console.log('purchase sent', { data })
-      resUtils.success(res, jsonUtils.messageToJson(message))
+      resUtils.success(res, jsonUtils.messageToJson(message, chat))
     },
     failure: error=> resUtils.failure(res, error.message),
   })
@@ -318,7 +318,7 @@ const receivePurchaseAccept = async (payload) => {
   })
   socket.sendJson({
     type: 'purchase_accept',
-    response: jsonUtils.messageToJson(msg, chat)
+    response: jsonUtils.messageToJson(msg, chat, sender)
   })
 }
 
@@ -344,7 +344,7 @@ const receivePurchaseDeny = async (payload) => {
   })
   socket.sendJson({
     type: 'purchase_deny',
-    response: jsonUtils.messageToJson(msg, chat)
+    response: jsonUtils.messageToJson(msg, chat, sender)
   })
 }
 
@@ -378,7 +378,7 @@ const receiveAttachment = async (payload) => {
 
   socket.sendJson({
     type: 'attachment',
-    response: jsonUtils.messageToJson(message, chat)
+    response: jsonUtils.messageToJson(message, chat, sender)
   })
 
   sendNotification(chat, sender.alias, 'message')

diff --git a/api/controllers/messages.ts b/api/controllers/messages.ts
@@ -166,7 +166,7 @@ const receiveMessage = async (payload) => {
 
 	socket.sendJson({
 		type: 'message',
-		response: jsonUtils.messageToJson(message, chat)
+		response: jsonUtils.messageToJson(message, chat, sender)
 	})
 
 	sendNotification(chat, sender.alias, 'message')

diff --git a/api/controllers/payment.ts b/api/controllers/payment.ts
@@ -145,7 +145,7 @@ const receivePayment = async (payload) => {
 
   socket.sendJson({
     type: 'direct_payment',
-    response: jsonUtils.messageToJson(message, chat)
+    response: jsonUtils.messageToJson(message, chat, sender)
   })
 
   sendNotification(chat, sender.alias, 'message')

diff --git a/api/grpc/index.ts b/api/grpc/index.ts
@@ -112,12 +112,14 @@ function subscribeInvoices(actions) {
 					createdAt: new Date(settleDate),
 					updatedAt: new Date(settleDate)
 				})
+
+				const sender = await models.Contact.findOne({ where: { id: senderId } })
+
 				socket.sendJson({
 					type: 'payment',
-					response: jsonUtils.messageToJson(message, chat)
+					response: jsonUtils.messageToJson(message, chat, sender)
 				})
-
-				const sender = await models.Contact.findOne({ where: { id: senderId } })
+
 				sendNotification(chat, sender.alias, 'message')
 			}
 		});

diff --git a/api/utils/json.ts b/api/utils/json.ts
@@ -13,7 +13,7 @@ function chatToJson(c) {
   })
 }
 
-function messageToJson(msg, chat = null) {
+function messageToJson(msg, chat, contact?) {
   const message = msg.dataValues||msg
   let statusMap = message.statusMap || null
   if(message.statusMap && typeof message.statusMap==='string'){
@@ -23,6 +23,7 @@ function messageToJson(msg, chat = null) {
     ...message,
     statusMap,
     chat: chat ? chatToJson(chat) : null,
+    contact: contact ? contactToJson(contact) : null
   })
 }
 

diff --git a/dist/api/controllers/confirmations.js b/dist/api/controllers/confirmations.js
diff --git a/dist/api/controllers/confirmations.js.map b/dist/api/controllers/confirmations.js.map
diff --git a/dist/api/controllers/invoices.js b/dist/api/controllers/invoices.js
diff --git a/dist/api/controllers/invoices.js.map b/dist/api/controllers/invoices.js.map
diff --git a/dist/api/controllers/media.js b/dist/api/controllers/media.js