maintenance commit

backend/controllers/auth.js

@@ -49,7 +49,7 @@ exports.login = async (req, res, next) => {
 		const token = jwt.sign(
 			{ email: loadedUser.email, userId: loadedUser.id },
 			"mysecret",
-			{ expiresIn: "1h" }
+			{ expiresIn: "24h" }
 		);
 		return res
 			.status(200)

backend/controllers/contact.js

@@ -1,18 +1,32 @@
 const Contact = require("../models/Contact");
 const Message = require("../models/Message");
-// const io = require("../socket");
+const Sequelize = require("sequelize");
 
 exports.getContacts = async (req, res) => {
-	// const contacts = await Contact.findAll();
-	const contacts = await Contact.findAll({
-		include: {
-			model: Message,
-			where: {
-				read: false,
+	try {
+		const contacts = await Contact.findAll({
+			include: { model: Message, attributes: [] },
+			attributes: {
+				include: [
+					[
+						Sequelize.literal(`(
+              SELECT COUNT(*)
+              FROM messages AS message
+              WHERE
+                  message.contactId = contact.id
+                  AND
+                  message.read = 0
+                  
+          )`),
+						"unreadMessages",
+					],
+				],
 			},
-			required: false,
-		},
-	});
+			order: [[Message, "createdAt", "DESC"]],
+		});
 
-	return res.json(contacts);
+		return res.json(contacts);
+	} catch (err) {
+		console.log(err);
+	}
 };

backend/controllers/message.js

@@ -1,55 +1,69 @@
+const fs = require("fs");
 const Message = require("../models/Message");
 const Contact = require("../models/Contact");
 const io = require("../socket");
 
 const wbot = require("./wbot");
+const { MessageMedia } = require("whatsapp-web.js");
 
-exports.getContactMessages = async (req, res) => {
+exports.getContactMessages = async (req, res, next) => {
 	const { contactId } = req.params;
-	const contact = await Contact.findByPk(contactId);
 
-	const contactMessages = await contact.getMessages();
+	try {
+		const contact = await Contact.findByPk(contactId);
+		const contactMessages = await contact.getMessages();
 
-	return res.json(contactMessages);
+		const result = await Message.update(
+			{ read: true },
+			{
+				where: {
+					contactId: contactId,
+					read: false,
+				},
+			}
+		);
+
+		return res.json(contactMessages);
+	} catch (err) {
+		next(err);
+	}
 };
 
-exports.postCreateContactMessage = async (req, res) => {
+exports.postCreateContactMessage = async (req, res, next) => {
 	const { contactId } = req.params;
 	const message = req.body;
+	const media = req.file;
 
-	const contact = await Contact.findByPk(contactId);
+	try {
+		const contact = await Contact.findByPk(contactId);
+		if (media) {
+			const newMedia = MessageMedia.fromFilePath(req.file.path);
+			message.mediaUrl = req.file.path;
+			if (newMedia.mimetype) {
+				message.mediaType = newMedia.mimetype.split("/")[0];
+			} else {
+				message.mediaType = "other";
+			}
 
-	const newMessage = await contact.createMessage(message);
+			wbot.getWbot().sendMessage(`${contact.number}@c.us`, newMedia);
+		} else {
+			wbot.getWbot().sendMessage(`${contact.number}@c.us`, message.messageBody);
+		}
 
-	if (!newMessage) {
-		return res.status(500).json({ message: "A mensagem não foi criada" });
+		const newMessage = await contact.createMessage(message);
+		if (!newMessage) {
+			const error = new Error("Erro ao inserir a mensagem no banco de dados");
+			error.satusCode = 501;
+			throw error;
+		}
+
+		io.getIO().to(contactId).emit("appMessage", {
+			action: "create",
+			message: newMessage,
+		});
+
+		return res.json({ message: "Mensagem enviada" });
+	} catch (err) {
+		next(err);
 	}
-
-	wbot.getWbot().sendMessage(`${contact.number}@c.us`, message.messageBody);
-
-	io.getIO().emit("appMessage", {
-		action: "create",
-		message: newMessage.dataValues,
-	});
-
-	return res.json(newMessage);
-};
-
-exports.postUpdateMessageStatus = async (req, res) => {
-	const { messagesToSetRead } = req.body;
-
-	await Promise.all(
-		messagesToSetRead.map(async message => {
-			await Message.update(
-				{ read: 1 },
-				{
-					where: {
-						id: message.id,
-					},
-				}
-			);
-		})
-	);
-
-	res.json({ message: "Mensagens lidas!" });
 };

backend/controllers/session.json

@@ -1 +1 @@
-{"WABrowserId":"\"ynZiZqR67F6o3M5nCIE3Ig==\"","WASecretBundle":"{\"key\":\"3kFQ7T0G4sbiCrb3ZwzDKzDdKLo6hObbUfygGby91H0=\",\"encKey\":\"ezpzST8/4752gQLd+Lj+yfZGqwzFqBlkvpelptnJ5dI=\",\"macKey\":\"3kFQ7T0G4sbiCrb3ZwzDKzDdKLo6hObbUfygGby91H0=\"}","WAToken1":"\"9g0Q+hqE6PdVX8yf2m2poDqpN+VB1NDbsSF3bp0xxE0=\"","WAToken2":"\"1@DnfzCyncYsMRZnUA+PnrZfYpux6mUSqrGPAFBgkU8b7NS6mge9SuJ4QDKUvt8HthVmH9mvovbb26zQ==\""}
+{"WABrowserId":"\"W5pw0Llb60mSeV7WOHnk8A==\"","WASecretBundle":"{\"key\":\"alDLbPjonDFzCh5PEPql9cy59LNh1HFG/AZJVoucuYI=\",\"encKey\":\"FQ1MZ2eIH9hKV4dqFoBYTv1/89aopcMAa4CXgh/9csM=\",\"macKey\":\"alDLbPjonDFzCh5PEPql9cy59LNh1HFG/AZJVoucuYI=\"}","WAToken1":"\"mjiCXmqu33f9L6eQ/8RP/ud+axdbx9y4wDFAqfJD90o=\"","WAToken2":"\"1@o99W6mNitfwQz+tg3dNp4f5/z0mMj3tR/fRgy2wuneqfze+ccCkZ9O8NT15xRlqPwAbgdpT+nJ0krg==\""}

backend/controllers/wbotMessageListener.js

@@ -1,38 +1,77 @@
-const io = require("../socket");
 const Contact = require("../models/Contact");
+const path = require("path");
+const fs = require("fs");
 
-const wbot = require("./wbot");
+const { getIO } = require("../socket");
+const { getWbot } = require("./wbot");
 
 const wbotMessageListener = () => {
-	wbot.getWbot().on("message", async msg => {
+	getWbot().on("message", async msg => {
+		let newMessage;
 		const msgContact = await msg.getContact();
+		const imageUrl = await msgContact.getProfilePicUrl();
 		try {
 			let contact = await Contact.findOne({
 				where: { number: msgContact.number },
 			});
+			// await contact.update({ imageURL: imageUrl });
+
 			if (!contact) {
 				try {
 					contact = await Contact.create({
-						name: msgContact.number.toString(),
+						name: msgContact.pushname || msgContact.number.toString(),
 						number: msgContact.number,
-						imageUrl: "",
+						imageURL: imageUrl,
 					});
-					io.getIO().emit("contact", {
+
+					contact.dataValues.unreadMessages = 1;
+
+					getIO().emit("contact", {
 						action: "create",
-						contact: contact.dataValues,
+						contact: contact,
 					});
 				} catch (err) {
 					console.log(err);
 				}
 			}
+			if (msg.hasMedia) {
+				const media = await msg.downloadMedia();
 
-			const newMessage = await contact.createMessage({
-				messageBody: msg.body,
-			});
-			io.getIO().emit("appMessage", {
+				if (media) {
+					if (!media.filename) {
+						let ext = media.mimetype.split("/")[1].split(";")[0];
+						let aux = Math.random(5).toString();
+						media.filename = aux.split(".")[1] + "." + ext;
+					}
+
+					fs.writeFile(
+						path.join(__dirname, "..", "public", media.filename),
+						media.data,
+						"base64",
+						err => {
+							console.log(err);
+						}
+					);
+
+					newMessage = await contact.createMessage({
+						mediaUrl: path.join("public", media.filename),
+						mediaType: media.mimetype.split("/")[0],
+						messageBody: msg.body || media.filename,
+					});
+				}
+			} else {
+				newMessage = await contact.createMessage({
+					messageBody: msg.body,
+				});
+			}
+
+			getIO().to(contact.id).to("notification").emit("appMessage", {
 				action: "create",
-				message: newMessage.dataValues,
+				message: newMessage,
 			});
+
+			let chat = await msg.getChat();
+			chat.sendSeen();
 		} catch (err) {
 			console.log(err);
 		}