From a694c4bdd67295d111be0ec97571393c9c0a64d3 Mon Sep 17 00:00:00 2001
From: Gustavo Quadri <87215048+gusquadri@users.noreply.github.com>
Date: Thu, 8 Jan 2026 00:46:52 -0300
Subject: [PATCH] fix: getmessagetype to ensure consistency with whatsapp
 behavior

---
 src/Socket/messages-send.ts | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/Socket/messages-send.ts b/src/Socket/messages-send.ts
index 61fb4860d91..0cae17a2185 100644
--- a/src/Socket/messages-send.ts
+++ b/src/Socket/messages-send.ts
@@ -1001,7 +1001,40 @@ export const makeMessagesSocket = (config: SocketConfig) => {
 	}
 
 	const getMessageType = (message: proto.IMessage) => {
-		if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3) {
+		if (message.viewOnceMessage?.message) {
+			return getMessageType(message.viewOnceMessage.message)
+		}
+
+		if (message.viewOnceMessageV2?.message) {
+			return getMessageType(message.viewOnceMessageV2.message)
+		}
+
+		if (message.viewOnceMessageV2Extension?.message) {
+			return getMessageType(message.viewOnceMessageV2Extension.message)
+		}
+
+		if (message.lottieStickerMessage?.message) {
+			return getMessageType(message.lottieStickerMessage.message)
+		}
+
+		if (message.ephemeralMessage?.message) {
+			return getMessageType(message.ephemeralMessage.message)
+		}
+
+		if (message.documentWithCaptionMessage?.message) {
+			return getMessageType(message.documentWithCaptionMessage.message)
+		}
+
+		if (message.reactionMessage || message.encReactionMessage) {
+			return 'reaction'
+		}
+
+		if (
+			message.pollCreationMessage ||
+			message.pollCreationMessageV2 ||
+			message.pollCreationMessageV3 ||
+			message.pollUpdateMessage
+		) {
 			return 'poll'
 		}