From f7e8fed7d83c9d0fe2357c45964f1bd6bc7e2ac8 Mon Sep 17 00:00:00 2001
From: canove <cassio@economicros.com.br>
Date: Tue, 4 Aug 2020 13:50:18 -0300
Subject: [PATCH] fix: lastMessage not changing when msg = fromMe

---
 backend/src/controllers/MessageController.js  | 9 +++++++--
 backend/src/services/wbotMessageListener.js   | 2 --
 frontend/src/components/MessagesList/index.js | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/backend/src/controllers/MessageController.js b/backend/src/controllers/MessageController.js
index cb92091..a92f121 100644
--- a/backend/src/controllers/MessageController.js
+++ b/backend/src/controllers/MessageController.js
@@ -104,7 +104,7 @@ exports.store = async (req, res, next) => {
 			{
 				model: Contact,
 				as: "contact",
-				attributes: ["number"],
+				attributes: ["number", "name", "profilePicUrl"],
 			},
 		],
 	});
@@ -124,11 +124,14 @@ exports.store = async (req, res, next) => {
 			`${ticket.contact.number}@c.us`,
 			newMedia
 		);
+
+		await ticket.update({ lastMessage: message.mediaUrl });
 	} else {
 		sentMessage = await wbot.sendMessage(
 			`${ticket.contact.number}@c.us`,
 			message.body
 		);
+		await ticket.update({ lastMessage: message.body });
 	}
 
 	message.id = sentMessage.id.id;
@@ -144,9 +147,11 @@ exports.store = async (req, res, next) => {
 		}`,
 	};
 
-	io.to(ticketId).emit("appMessage", {
+	io.to(ticketId).to("notification").emit("appMessage", {
 		action: "create",
 		message: serialziedMessage,
+		ticket: ticket,
+		contact: ticket.contact,
 	});
 
 	await setMessagesAsRead(ticketId);
diff --git a/backend/src/services/wbotMessageListener.js b/backend/src/services/wbotMessageListener.js
index 81e1b56..57bc6ab 100644
--- a/backend/src/services/wbotMessageListener.js
+++ b/backend/src/services/wbotMessageListener.js
@@ -120,8 +120,6 @@ const handleMessage = async (msg, ticket, contact) => {
 
 	const serializaedTicket = {
 		...ticket.dataValues,
-		// unreadMessages: 1,
-		// lastMessage: newMessage.body,
 		contact: contact,
 	};
 
diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js
index b9c9ff6..843676e 100644
--- a/frontend/src/components/MessagesList/index.js
+++ b/frontend/src/components/MessagesList/index.js
@@ -368,7 +368,11 @@ const MessagesList = () => {
 				/>
 			);
 		} else {
-			return <a href={message.mediaUrl}>Download</a>;
+			return (
+				<a href={message.mediaUrl} target="_blank" rel="noopener noreferrer">
+					Download
+				</a>
+			);
 		}
 	};