From 5ffa3a51b65b53ebf5c85ac327c281f2fd7c7a33 Mon Sep 17 00:00:00 2001
From: Rajeh Taher <rajeh@reforward.dev>
Date: Sat, 18 May 2024 12:56:44 +0300
Subject: [PATCH] fix(master): linting and making functionality better

---
 src/Socket/chats.ts         |  2 +-
 src/Socket/messages-recv.ts | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Socket/chats.ts b/src/Socket/chats.ts
index f7ed774..cbfe361 100644
--- a/src/Socket/chats.ts
+++ b/src/Socket/chats.ts
@@ -600,7 +600,7 @@ export const makeChatsSocket = (config: SocketConfig) => {
 		const jid = attrs.from
 		const participant = attrs.participant || attrs.from
 
-		if(shouldIgnoreJid(jid) && jid != '@s.whatsapp.net') {
+		if(shouldIgnoreJid(jid) && jid !== '@s.whatsapp.net') {
 			return
 		}
 
diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index c579099..2b8e472 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -651,7 +651,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 
 	const handleNotification = async(node: BinaryNode) => {
 		const remoteJid = node.attrs.from
-		if(shouldIgnoreJid(remoteJid) && remoteJid != '@s.whatsapp.net') {
+		if(shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
 			logger.debug({ remoteJid, id: node.attrs.id }, 'ignored notification')
 			await sendMessageAck(node)
 			return
@@ -683,6 +683,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 	}
 
 	const handleMessage = async(node: BinaryNode) => {
+		if(shouldIgnoreJid(msg.key.remoteJid!) && msg.key.remoteJid! !== '@s.whatsapp.net') {
+			logger.debug({ key: msg.key }, 'ignored message')
+			await sendMessageAck(node)
+			return
+		}
+
 		const { fullMessage: msg, category, author, decrypt } = decryptMessageNode(
 			node,
 			authState.creds.me!.id,
@@ -697,12 +703,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 			}
 		}
 
-		if(shouldIgnoreJid(msg.key.remoteJid!) && msg.key.remoteJid! != '@s.whatsapp.net') {
-			logger.debug({ key: msg.key }, 'ignored message')
-			await sendMessageAck(node)
-			return
-		}
-
 		await Promise.all([
 			processingMutex.mutex(
 				async() => {