From d09025e8dd6339312cf3818481ea54c97774381c Mon Sep 17 00:00:00 2001
From: Adhiraj Singh <adhirajsingh1001@gmail.com>
Date: Sat, 18 Dec 2021 17:01:06 +0530
Subject: [PATCH] fix: ephemeral toggle not being applied correctly on legacy

---
 src/LegacySocket/messages.ts | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/LegacySocket/messages.ts b/src/LegacySocket/messages.ts
index fbde9a7..399e93d 100644
--- a/src/LegacySocket/messages.ts
+++ b/src/LegacySocket/messages.ts
@@ -131,19 +131,7 @@ const makeMessagesSocket = (config: LegacySocketConfig) => {
 			}
 		}
 
-		const ephemeralProtocolMsg = message.message?.ephemeralMessage?.message?.protocolMessage
-        if (
-            ephemeralProtocolMsg && 
-            ephemeralProtocolMsg.type === proto.ProtocolMessage.ProtocolMessageType.EPHEMERAL_SETTING
-        ) {
-            chatUpdate.ephemeralSettingTimestamp = message.messageTimestamp
-            chatUpdate.ephemeralExpiration = ephemeralProtocolMsg.ephemeralExpiration
-
-			if(isJidGroup(jid)) {
-				emitGroupUpdate({ ephemeralDuration: ephemeralProtocolMsg.ephemeralExpiration || null })
-			}
-        }
-		const protocolMessage = message.message?.protocolMessage
+		const protocolMessage = message.message?.protocolMessage || message.message?.ephemeralMessage?.message?.protocolMessage
         // if it's a message to delete another message
         if (protocolMessage) {
             switch (protocolMessage.type) {
@@ -158,6 +146,14 @@ const makeMessagesSocket = (config: LegacySocketConfig) => {
 						}
 					])
                     return
+				case proto.ProtocolMessage.ProtocolMessageType.EPHEMERAL_SETTING:
+					chatUpdate.ephemeralSettingTimestamp = message.messageTimestamp
+            		chatUpdate.ephemeralExpiration = protocolMessage.ephemeralExpiration
+
+					if(isJidGroup(jid)) {
+						emitGroupUpdate({ ephemeralDuration: protocolMessage.ephemeralExpiration || null })
+					}
+					break
                 default:
                     break
             }