From e740fc5b4a66b9b8fbb1156f5d4413411825a4a2 Mon Sep 17 00:00:00 2001
From: Rajeh Taher <rajeh@reforward.dev>
Date: Sun, 18 Jan 2026 01:35:21 +0200
Subject: [PATCH] messages-send: revamp message type function

---
 src/Socket/messages-send.ts | 41 +++++++++----------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/src/Socket/messages-send.ts b/src/Socket/messages-send.ts
index 1202e87d..b6177ede 100644
--- a/src/Socket/messages-send.ts
+++ b/src/Socket/messages-send.ts
@@ -689,7 +689,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
 				return
 			}
 
-			if (normalizeMessageContent(message)?.pinInChatMessage) {
+			if (normalizeMessageContent(message)?.pinInChatMessage || normalizeMessageContent(message)?.reactionMessage) {
 				extraAttrs['decrypt-fail'] = 'hide' // todo: expand for reactions and other types
 			}
 
@@ -1044,48 +1044,27 @@ export const makeMessagesSocket = (config: SocketConfig) => {
 	}
 
 	const getMessageType = (message: proto.IMessage) => {
-		if (message.viewOnceMessage?.message) {
-			return getMessageType(message.viewOnceMessage.message)
-		}
+		const normalizedMessage = normalizeMessageContent(message)
+		if (!normalizedMessage) return 'text'
 
-		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) {
+		if (normalizedMessage.reactionMessage || normalizedMessage.encReactionMessage) {
 			return 'reaction'
 		}
 
 		if (
-			message.pollCreationMessage ||
-			message.pollCreationMessageV2 ||
-			message.pollCreationMessageV3 ||
-			message.pollUpdateMessage
+			normalizedMessage.pollCreationMessage ||
+			normalizedMessage.pollCreationMessageV2 ||
+			normalizedMessage.pollCreationMessageV3 ||
+			normalizedMessage.pollUpdateMessage
 		) {
 			return 'poll'
 		}
 
-		if (message.eventMessage) {
+		if (normalizedMessage.eventMessage) {
 			return 'event'
 		}
 
-		if (getMediaType(message) !== '') {
+		if (getMediaType(normalizedMessage) !== '') {
 			return 'media'
 		}