@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/Utils/process-message.js

@@ -2,38 +2,72 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const WAProto_1 = require("../../WAProto")
-const Types_1 = require("../Types")
-const messages_1 = require("../Utils/messages")
-const WABinary_1 = require("../WABinary")
-const crypto_1 = require("./crypto")
-const generics_1 = require("./generics")
-const history_1 = require("./history")
+const { proto } = require("../../WAProto")
+const { WAMessageStubType } = require("../Types")
+const {
+  getDevice, 
+  getContentType,
+  normalizeMessageContent 
+} = require("../Utils")
+const {
+  areJidsSameUser,
+  isHostedLidUser, 
+  isHostedPnUser, 
+  isJidBroadcast,
+  isJidStatusBroadcast, 
+  isLidUser, 
+  jidDecode, 
+  jidEncode, 
+  jidNormalizedUser 
+} = require("../WABinary")
+const { 
+  aesDecryptGCM,
+  hmacSign 
+} = require("./crypto")
+const {
+  getKeyAuthor, 
+  toNumber 
+} = require("./generics")
+const { downloadAndProcessHistorySyncNotification } = require("./history")
 
 const REAL_MSG_STUB_TYPES = new Set([
-    Types_1.WAMessageStubType.CALL_MISSED_GROUP_VIDEO,
-    Types_1.WAMessageStubType.CALL_MISSED_GROUP_VOICE,
-    Types_1.WAMessageStubType.CALL_MISSED_VIDEO,
-    Types_1.WAMessageStubType.CALL_MISSED_VOICE
+    WAMessageStubType.CALL_MISSED_GROUP_VIDEO,
+    WAMessageStubType.CALL_MISSED_GROUP_VOICE,
+    WAMessageStubType.CALL_MISSED_VIDEO,
+    WAMessageStubType.CALL_MISSED_VOICE
 ])
 
 const REAL_MSG_REQ_ME_STUB_TYPES = new Set([
-    Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD
+    WAMessageStubType.GROUP_PARTICIPANT_ADD
 ])
 
 /** Cleans a received message to further processing */
-const cleanMessage = (message, meId) => {
+const cleanMessage = (message, meId, meLid) => {
     // ensure remoteJid and participant doesn't have device or agent in it
-    message.key.remoteJid = WABinary_1.jidNormalizedUser(message.key.remoteJid)
-    message.key.participant = message.key.participant ? WABinary_1.jidNormalizedUser(message.key.participant) : undefined
-    const content = messages_1.normalizeMessageContent(message.message)
+    if (isHostedPnUser(message.key.remoteJid) || isHostedLidUser(message.key.remoteJid)) {
+        message.key.remoteJid = jidEncode(jidDecode(message.key?.remoteJid)?.user, isHostedPnUser(message.key.remoteJid) ? 's.whatsapp.net' : 'lid')
+    }
+    else {
+        message.key.remoteJid = jidNormalizedUser(message.key.remoteJid)
+    }
+    
+    if (isHostedPnUser(message.key.participant) || isHostedLidUser(message.key.participant)) {
+        message.key.participant = jidEncode(jidDecode(message.key.participant)?.user, isHostedPnUser(message.key.participant) ? 's.whatsapp.net' : 'lid')
+    }
+    else {
+        message.key.participant = jidNormalizedUser(message.key.participant)
+    }
+    const content = normalizeMessageContent(message.message)
+    
     // if the message has a reaction, ensure fromMe & remoteJid are from our perspective
     if (content?.reactionMessage) {
         normaliseKey(content.reactionMessage.key)
     }
+    
     if (content?.pollUpdateMessage) {
         normaliseKey(content.pollUpdateMessage.pollCreationMessageKey)
     }
+    
     function normaliseKey(msgKey) {
         // if the reaction is from another user
         // we've to correctly map the key to this user's perspective
@@ -41,11 +75,13 @@ const cleanMessage = (message, meId) => {
             // if the sender believed the message being reacted to is not from them
             // we've to correct the key to be from them, or some other participant
             msgKey.fromMe = !msgKey.fromMe
-                ? WABinary_1.areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId)
-                // if the message being reacted to, was from them
-                // fromMe automatically becomes false
-                : false
+                ? areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId) ||
+                    areJidsSameUser(msgKey.participant || msgKey.remoteJid, meLid)
+                : // if the message being reacted to, was from them
+                    // fromMe automatically becomes false
+                    false
             // set the remoteJid to being the same as the chat the message came from
+            // TODO: investigate inconsistencies
             msgKey.remoteJid = message.key.remoteJid
             // set participant of the message
             msgKey.participant = msgKey.participant || message.key.participant
@@ -53,32 +89,28 @@ const cleanMessage = (message, meId) => {
     }
 }
 
-const isRealMessage = (message, meId) => {
-    const normalizedContent = messages_1.normalizeMessageContent(message.message)
-    const hasSomeContent = !!messages_1.getContentType(normalizedContent)
-    return (
-        !!normalizedContent ||
+// TODO: target:audit AUDIT THIS FUNCTION AGAIN
+const isRealMessage = (message) => {
+    const normalizedContent = normalizeMessageContent(message.message)
+    const hasSomeContent = !!getContentType(normalizedContent)
+    return ((!!normalizedContent ||
         REAL_MSG_STUB_TYPES.has(message.messageStubType) ||
-        (
-            REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType) &&
-            message.messageStubParameters?.some(p => WABinary_1.areJidsSameUser(meId, p))
-        )
-    ) &&
-    hasSomeContent &&
-    !normalizedContent?.protocolMessage &&
-    !normalizedContent?.reactionMessage &&
-    !normalizedContent?.pollUpdateMessage
+        REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType)) &&
+        hasSomeContent &&
+        !normalizedContent?.protocolMessage &&
+        !normalizedContent?.reactionMessage &&
+        !normalizedContent?.pollUpdateMessage)
 }
 
-const shouldIncrementChatUnread = (message) => (!message.key.fromMe && !message.messageStubType)
+const shouldIncrementChatUnread = (message) => !message.key.fromMe && !message.messageStubType
 
 /**
  * Get the ID of the chat from the given key.
  * Typically -- that'll be the remoteJid, but for broadcasts, it'll be the participant
  */
 const getChatId = ({ remoteJid, participant, fromMe }) => {
-    if (WABinary_1.isJidBroadcast(remoteJid)
-        && !WABinary_1.isJidStatusBroadcast(remoteJid)
+    if (isJidBroadcast(remoteJid)
+        && !isJidStatusBroadcast(remoteJid)
         && !fromMe) {
         return participant
     }
@@ -99,12 +131,12 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
         toBinary('Poll Vote'),
         new Uint8Array([1])
     ])
-    const key0 = crypto_1.hmacSign(pollEncKey, new Uint8Array(32), 'sha256')
-    const decKey = crypto_1.hmacSign(sign, key0, 'sha256')
+    const key0 = hmacSign(pollEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
     const aad = toBinary(`${pollMsgId}\u0000${voterJid}`)
-    const decrypted = crypto_1.aesDecryptGCM(encPayload, decKey, encIv, aad)
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, aad)
     
-    return WAProto_1.proto.Message.PollVoteMessage.decode(decrypted)
+    return proto.Message.PollVoteMessage.decode(decrypted)
     
     function toBinary(txt) {
         return Buffer.from(txt)
@@ -125,11 +157,11 @@ function decryptEventEdit({ encPayload, encIv }, { eventCreatorJid, eventMsgId,
         new Uint8Array([1])
     ])
     
-    const key0 = crypto_1.hmacSign(eventEncKey, new Uint8Array(32), 'sha256')
-    const decKey = crypto_1.hmacSign(sign, key0, 'sha256')
-    const decrypted = crypto_1.aesDecryptGCM(encPayload, decKey, encIv, null)
+    const key0 = hmacSign(eventEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, null)
     
-    return WAProto_1.proto.Message.decode(decrypted)
+    return proto.Message.decode(decrypted)
     
     function toBinary(txt) {
         return Buffer.from(txt)
@@ -151,12 +183,12 @@ function decryptEventResponse({ encPayload, encIv }, { eventCreatorJid, eventMsg
         new Uint8Array([1])
     ])
     
-    const key0 = crypto_1.hmacSign(eventEncKey, new Uint8Array(32), 'sha256')
-    const decKey = crypto_1.hmacSign(sign, key0, 'sha256')
+    const key0 = hmacSign(eventEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
     const aad = toBinary(`${eventMsgId}\u0000${responderJid}`)
-    const decrypted = crypto_1.aesDecryptGCM(encPayload, decKey, encIv, aad)
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, aad)
     
-    return WAProto_1.proto.Message.EventResponseMessage.decode(decrypted)
+    return proto.Message.EventResponseMessage.decode(decrypted)
     
     function toBinary(txt) {
         return Buffer.from(txt)
@@ -177,11 +209,11 @@ function decryptComment({ encPayload, encIv }, { commentCreatorJid, commentMsgId
         new Uint8Array([1])
     ])
     
-    const key0 = crypto_1.hmacSign(commentEncKey, new Uint8Array(32), 'sha256')
-    const decKey = crypto_1.hmacSign(sign, key0, 'sha256')
-    const decrypted = crypto_1.aesDecryptGCM(encPayload, decKey, encIv, null)
+    const key0 = hmacSign(commentEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, null)
     
-    return WAProto_1.proto.Message.decode(decrypted)
+    return proto.Message.decode(decrypted)
     
     function toBinary(txt) {
         return Buffer.from(txt)
@@ -202,11 +234,11 @@ function decryptReaction({ encPayload, encIv }, { reactionCreatorJid, reactionMs
         new Uint8Array([1])
     ])
     
-    const key0 = crypto_1.hmacSign(reactionEncKey, new Uint8Array(32), 'sha256')
-    const decKey = crypto_1.hmacSign(sign, key0, 'sha256')
-    const decrypted = crypto_1.aesDecryptGCM(encPayload, decKey, encIv, null)
+    const key0 = hmacSign(reactionEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, null)
     
-    return WAProto_1.proto.Message.ReactionMessage.decode(decrypted)
+    return proto.Message.ReactionMessage.decode(decrypted)
     
     function toBinary(txt) {
         return Buffer.from(txt)
@@ -217,17 +249,17 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     const meId = creds.me.id
     const meLid = creds.me.lid
     const { accountSettings } = creds
-    const chat = { id: WABinary_1.jidNormalizedUser(getChatId(message.key)) }
-    const isRealMsg = isRealMessage(message, meId)
+    const chat = { id: jidNormalizedUser(getChatId(message.key)) }
+    const isRealMsg = isRealMessage(message)
     if (isRealMsg) {
         chat.messages = [{ message }]
-        chat.conversationTimestamp = generics_1.toNumber(message.messageTimestamp)
+        chat.conversationTimestamp = toNumber(message.messageTimestamp)
         // only increment unread count if not CIPHERTEXT and from another person
         if (shouldIncrementChatUnread(message)) {
             chat.unreadCount = (chat.unreadCount || 0) + 1
         }
     }
-    const content = messages_1.normalizeMessageContent(message.message)
+    const content = normalizeMessageContent(message.message)
     // unarchive chat if it's a real message, or someone reacted to our message
     // and we've the unarchive chats setting on
     if (isRealMsg || content?.reactionMessage?.key?.fromMe
@@ -238,18 +270,21 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     const protocolMsg = content?.protocolMessage
     if (protocolMsg) {
         switch (protocolMsg.type) {
-            case WAProto_1.proto.Message.ProtocolMessage.Type.HISTORY_SYNC_NOTIFICATION:
+            case proto.Message.ProtocolMessage.Type.HISTORY_SYNC_NOTIFICATION:
                 const histNotification = protocolMsg.historySyncNotification
                 const process = shouldProcessHistoryMsg
                 const isLatest = !creds.processedHistoryMessages?.length
+                
                 logger?.info({
                     histNotification,
                     process,
                     id: message.key.id,
-                    isLatest,
+                    isLatest
                 }, 'got history notification')
+                
                 if (process) {
-                    if (histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
+                    // TODO: investigate
+                    if (histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND) {
                         ev.emit('creds.update', {
                             processedHistoryMessages: [
                                 ...(creds.processedHistoryMessages || []),
@@ -257,65 +292,77 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                             ]
                         })
                     }
-                    const data = await history_1.downloadAndProcessHistorySyncNotification(histNotification, options)
+                    
+                    const data = await downloadAndProcessHistorySyncNotification(histNotification, options)
                     ev.emit('messaging-history.set', {
                         ...data,
-                        isLatest: histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND
-                            ? isLatest
-                            : undefined,
+                        isLatest: histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND ? isLatest : undefined,
                         peerDataRequestSessionId: histNotification.peerDataRequestSessionId
                     })
                 }
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE:
+            case proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE:
                 const keys = protocolMsg.appStateSyncKeyShare.keys
+                
                 if (keys?.length) {
                     let newAppStateSyncKeyId = ''
+                    
                     await keyStore.transaction(async () => {
                         const newKeys = []
+                        
                         for (const { keyData, keyId } of keys) {
                             const strKeyId = Buffer.from(keyId.keyId).toString('base64')
+                            
                             newKeys.push(strKeyId)
+                            
                             await keyStore.set({ 'app-state-sync-key': { [strKeyId]: keyData } })
+                            
                             newAppStateSyncKeyId = strKeyId
                         }
+                        
                         logger?.info({ newAppStateSyncKeyId, newKeys }, 'injecting new app state sync keys')
                     }, meId)
                     ev.emit('creds.update', { myAppStateKeyId: newAppStateSyncKeyId })
                 }
+                
                 else {
                     logger?.info({ protocolMsg }, 'recv app state sync with 0 keys')
                 }
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE:
+            case proto.Message.ProtocolMessage.Type.REVOKE:
                 ev.emit('messages.update', [
                     {
                         key: {
                             ...message.key,
                             id: protocolMsg.key.id
                         },
-                        update: { message: null, messageStubType: Types_1.WAMessageStubType.REVOKE, key: message.key }
+                        update: { message: null, messageStubType: WAMessageStubType.REVOKE, key: message.key }
                     }
                 ])
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING:
+            case proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING:
                 Object.assign(chat, {
-                    ephemeralSettingTimestamp: generics_1.toNumber(message.messageTimestamp),
+                    ephemeralSettingTimestamp: toNumber(message.messageTimestamp),
                     ephemeralExpiration: protocolMsg.ephemeralExpiration || null
                 })
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
+            case proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
                 const response = protocolMsg.peerDataOperationRequestResponseMessage
+                
                 if (response) {
-                    await laceholderResendCache?.del(response.stanzaId)
+                    await placeholderResendCache?.del(response.stanzaId)
+                    
                     // TODO: IMPLEMENT HISTORY SYNC ETC (sticker uploads etc.).
                     const { peerDataOperationResult } = response
+                    
                     for (const result of peerDataOperationResult) {
                         const { placeholderMessageResendResponse: retryResponse } = result
+                        
                         //eslint-disable-next-line max-depth
                         if (retryResponse) {
-                            const webMessageInfo = WAProto_1.proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes)
+                            const webMessageInfo = proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes)
                             // wait till another upsert event is available, don't want it to be part of the PDO response message
+                            // TODO: parse through proper message handling utilities (to add relevant key fields)
                             setTimeout(() => {
                                 ev.emit('messages.upsert', {
                                     messages: [webMessageInfo],
@@ -327,7 +374,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     }
                 }
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.MESSAGE_EDIT:
+            case proto.Message.ProtocolMessage.Type.MESSAGE_EDIT:
                 ev.emit('messages.update', [
                     {
                         // flip the sender / fromMe properties because they're in the perspective of the sender
@@ -339,15 +386,29 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                                 }
                             },
                             messageTimestamp: protocolMsg.timestampMs
-                                ? Math.floor(generics_1.toNumber(protocolMsg.timestampMs) / 1000)
+                                ? Math.floor(toNumber(protocolMsg.timestampMs) / 1000)
                                 : message.messageTimestamp
                         }
                     }
                 ])
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
+            case proto.Message.ProtocolMessage.Type.GROUP_MEMBER_LABEL_CHANGE:
+                const labelAssociationMsg = protocolMsg.memberLabel
+                
+                if (labelAssociationMsg?.label) {
+                	ev.emit('group.member-tag.update', {
+                		groupId: chat.id, 
+                		label: labelAssociationMsg.label,
+                		participant: message.key.participant, 
+                		participantAlt: message.key.participantAlt, 
+                		messageTimestamp: Number(message.messageTimestamp)
+                	}) 
+                }
+                break
+            case proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
                 const encodedPayload = protocolMsg.lidMigrationMappingSyncMessage?.encodedMappingPayload
-                const { pnToLidMappings, chatDbMigrationTimestamp } = WAProto_1.proto.LIDMigrationMappingSyncPayload.decode(encodedPayload)
+                
+                const { pnToLidMappings, chatDbMigrationTimestamp } = proto.LIDMigrationMappingSyncPayload.decode(encodedPayload)
                 
                 logger?.debug({ pnToLidMappings, chatDbMigrationTimestamp }, 'got lid mappings and chat db migration timestamp')
                 
@@ -359,11 +420,17 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 }
                 
                 await signalRepository.lidMapping.storeLIDPNMappings(pairs)
+                
+                if (pairs.length) {
+                    for (const { pn, lid } of pairs) {
+                        await signalRepository.migrateSession(pn, lid)
+                    }
+                }
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.LIMIT_SHARING:
+            case proto.Message.ProtocolMessage.Type.LIMIT_SHARING:
                 ev.emit('limit-sharing.update', {
                 	id: message.key.remoteJid, 
-                    author: WABinary_1.areJidsSameUser(message.key.remoteJid, protocolMsg.key.remoteJid) ? WABinary_1.jidNormalizedUser(meId) : message.key.remoteJid, 
+                    author: areJidsSameUser(message.key.remoteJid, protocolMsg.key.remoteJid) ? jidNormalizedUser(meId) : message.key.remoteJid, 
                     action: `${protocolMsg.limitSharing.sharingLimited ? 'on' : 'off'}`, 
                     trigger: protocolMsg.limitSharing.trigger, 
                     update_time: protocolMsg.limitSharing.limitSharingSettingTimestamp
@@ -383,94 +450,102 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     }
     else if (message.messageStubType) {
         const jid = message.key?.remoteJid
-        //let actor = whatsappID (message.participant)
+        
         let participants
-        const emitParticipantsUpdate = (action) => (ev.emit('group-participants.update', { id: jid, author: message.participant, participants, action }))
+        
+        const emitParticipantsUpdate = (action) => ev.emit('group-participants.update', {
+            id: jid,
+            author: message.key.participant,
+            authorPn: message.key.participantAlt,
+            participants,
+            action
+        })
+        
         const emitGroupUpdate = (update) => {
-            ev.emit('groups.update', [{ id: jid, ...update, author: message.participant ? message.participant : undefined }])
+            ev.emit('groups.update', [
+                { id: jid, ...update, author: message.key.participant ?? undefined, authorPn: message.key.participantAlt }
+            ])
         }
+        
         const emitGroupRequestJoin = (participant, action, method) => {
-            ev.emit('group.join-request', { id: jid, author: message.participant, participant, action, method: method })
+            ev.emit('group.join-request', {
+                id: jid,
+                author: message.key.participant,
+                authorPn: message.key.participantAlt,
+                participant: participant.lid,
+                participantPn: participant.pn,
+                action,
+                method: method
+            })
         }
-        const participantsIncludesMe = () => participants.find(jid => WABinary_1.areJidsSameUser(meId, jid))
+        
+        const participantsIncludesMe = () => participants.find(jid => areJidsSameUser(meId, jid.phoneNumber)) // ADD SUPPORT FOR LID
         switch (message.messageStubType) {
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
-                participants = message.messageStubParameters || []
+            case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
                 emitParticipantsUpdate('modify')
                 break
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
-              participants = message.messageStubParameters || [];
-              emitParticipantsUpdate('leave');
-              // mark the chat read only if you left the group
-              if (participantsIncludesMe()) {
-                chat.readOnly = true;
-              }
-              break;
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
-                participants = message.messageStubParameters || []
+            case WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
+            case WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
                 emitParticipantsUpdate('remove')
+                
                 // mark the chat read only if you left the group
                 if (participantsIncludesMe()) {
                     chat.readOnly = true
                 }
                 break
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD:
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_INVITE:
-              let actionGp = 'invite'
-              participants = message.messageStubParameters || []
-              if (participantsIncludesMe()) chat.readOnly = false;
-              if (message?.key?.participant && !participants.includes(message?.key?.participant)) {
-                actionGp = 'approval-invite'
-              }
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN:
-                participants = message.messageStubParameters || []
+            case WAMessageStubType.GROUP_PARTICIPANT_ADD:
+            case WAMessageStubType.GROUP_PARTICIPANT_INVITE:
+            case WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
+                
                 if (participantsIncludesMe()) {
                     chat.readOnly = false
                 }
+                
                 emitParticipantsUpdate('add')
                 break
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_DEMOTE:
-            case Types_1.WAMessageStubType.COMMUNITY_PARTICIPANT_DEMOTE:
-                participants = message.messageStubParameters || []
+            case WAMessageStubType.GROUP_PARTICIPANT_DEMOTE:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
                 emitParticipantsUpdate('demote')
                 break
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_PROMOTE:
-            case Types_1.WAMessageStubType.COMMUNITY_PARTICIPANT_PROMOTE:
-                participants = message.messageStubParameters || []
+            case WAMessageStubType.GROUP_PARTICIPANT_PROMOTE:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
                 emitParticipantsUpdate('promote')
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
+            case WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
                 const announceValue = message.messageStubParameters?.[0]
                 emitGroupUpdate({ announce: announceValue === 'true' || announceValue === 'on' })
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT:
+            case WAMessageStubType.GROUP_CHANGE_RESTRICT:
                 const restrictValue = message.messageStubParameters?.[0]
                 emitGroupUpdate({ restrict: restrictValue === 'true' || restrictValue === 'on' })
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT:
+            case WAMessageStubType.GROUP_CHANGE_SUBJECT:
                 const name = message.messageStubParameters?.[0]
                 chat.name = name
                 emitGroupUpdate({ subject: name })
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION:
+            case WAMessageStubType.GROUP_CHANGE_DESCRIPTION:
                 const description = message.messageStubParameters?.[0]
                 chat.description = description
                 emitGroupUpdate({ desc: description })
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
+            case WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
                 const code = message.messageStubParameters?.[0]
                 emitGroupUpdate({ inviteCode: code })
                 break
-            case Types_1.WAMessageStubType.GROUP_MEMBER_ADD_MODE:
+            case WAMessageStubType.GROUP_MEMBER_ADD_MODE:
                 const memberAddValue = message.messageStubParameters?.[0]
                 emitGroupUpdate({ memberAddMode: memberAddValue === 'all_member_add' })
                 break
-            case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE:
+            case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE:
                 const approvalMode = message.messageStubParameters?.[0]
                 emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' })
                 break
-            case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
-                const participant = message.messageStubParameters?.[0]
+            case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD: // TODO: Add other events
+                const participant = JSON.parse(message.messageStubParameters?.[0])
                 const action = message.messageStubParameters?.[1]
                 const method = message.messageStubParameters?.[2]
                 emitGroupRequestJoin(participant, action, method)
@@ -485,13 +560,13 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         const pollMsg = await getMessage(creationMsgKey)
         if (pollMsg) {
             try {
-                const meLidNormalised = WABinary_1.jidNormalizedUser(meLid)
-                const getDevice = messages_1.getDevice(creationMsgKey.id) 
-                const pollCreationFromMe = getDevice === 'baileys' ? true : false
+                const meLidNormalised = jidNormalizedUser(meLid)
+                const deviceType = getDevice(creationMsgKey.id) 
+                const pollCreationFromMe = deviceType === 'baileys' ? true : false
                 const pollEncKey = pollMsg.messageContextInfo?.messageSecret
-                const voterJid = generics_1.getKeyAuthor(message.key, meLidNormalised)
+                const voterJid = getKeyAuthor(message.key, meLidNormalised)
 
-                let pollCreatorJid = generics_1.getKeyAuthor(creationMsgKey, meLidNormalised)
+                let pollCreatorJid = getKeyAuthor(creationMsgKey, meLidNormalised)
 
                 if (pollCreationFromMe) {
                     pollCreatorJid = meLidNormalised
@@ -535,15 +610,15 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         const encEventEdit = content.secretEncryptedMessage
         const creationMsgKey = encEventEdit.targetMessageKey
         
-        if (WAProto_1.proto.Message.SecretEncryptedMessage.SecretEncType[encEventEdit.secretEncType] !== 'EVENT_EDIT') return
+        if (proto.Message.SecretEncryptedMessage.SecretEncType[encEventEdit.secretEncType] !== 'EVENT_EDIT') return
 
         // we need to fetch the event creation message to get the event enc key
         const eventMsg = await getMessage(creationMsgKey)
         if (eventMsg) {
             try {
-                const meLidNormalised = WABinary_1.jidNormalizedUser(meLid)
-                const eventCreatorJid = generics_1.getKeyAuthor(message.key, meLidNormalised)
-                const responderJid = generics_1.getKeyAuthor(message.key, meLidNormalised)
+                const meLidNormalised = jidNormalizedUser(meLid)
+                const eventCreatorJid = getKeyAuthor(message.key, meLidNormalised)
+                const responderJid = getKeyAuthor(message.key, meLidNormalised)
                 const eventEncKey = eventMsg.messageContextInfo?.messageSecret
 
                 if (!eventEncKey) {
@@ -555,7 +630,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                         eventMsgId: creationMsgKey.id,
                         responderJid
                     })
-                    const content = messages_1.normalizeMessageContent(responseMsg)
+                    const content = normalizeMessageContent(responseMsg)
                     const protocolMsg = content?.protocolMessage
 
                     ev.emit('messages.update', [
@@ -569,7 +644,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                                 	}
                                 }, 
                                 messageTimestamp: protocolMsg.timestampMs
-                             	   ? Math.floor(generics_1.toNumber(protocolMsg.timestampMs) / 1000)
+                             	   ? Math.floor(toNumber(protocolMsg.timestampMs) / 1000)
                           	      : message.messageTimestamp
                             }
                         }
@@ -592,9 +667,9 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         const eventMsg = await getMessage(creationMsgKey)
         if (eventMsg) {
             try {
-                const meLidNormalised = WABinary_1.jidNormalizedUser(meLid)
-                const eventCreatorJid = generics_1.getKeyAuthor(creationMsgKey, meLidNormalised)
-                const responderJid = generics_1.getKeyAuthor(message.key, meLidNormalised)
+                const meLidNormalised = jidNormalizedUser(meLid)
+                const eventCreatorJid = getKeyAuthor(creationMsgKey, meLidNormalised)
+                const responderJid = getKeyAuthor(message.key, meLidNormalised)
                 const eventEncKey = eventMsg.messageContextInfo?.messageSecret
 
                 if (!eventEncKey) {
@@ -635,11 +710,11 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         const encComment = content.encCommentMessage
         const creationMsgKey = encComment.targetMessageKey
 
-        // we need to fetch the message to get the reaction enc key
+        // we need to fetch the message to get the comment enc key
         const commentMsg = await getMessage(creationMsgKey)
         if (commentMsg) {
             try {
-                const meLidNormalised = WABinary_1.jidNormalizedUser(meLid)
+                const meLidNormalised = jidNormalizedUser(meLid)
                 const commentCreatorJid = creationMsgKey.participant ? creationMsgKey.participant : message.key?.participant ? message.key.participant : meLidNormalised
                 const commentJid = message.key?.participant ? message.key.participant : creationMsgKey.participant ? creationMsgKey.participant : meLidNormalised
                 const commentEncKey = commentMsg.messageContextInfo?.messageSecret
@@ -679,7 +754,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         const reactMsg = await getMessage(creationMsgKey)
         if (reactMsg) {
             try {
-                const meLidNormalised = WABinary_1.jidNormalizedUser(meLid)
+                const meLidNormalised = jidNormalizedUser(meLid)
                 const reactionCreatorJid = creationMsgKey.participant ? creationMsgKey.participant : message.key?.participant ? message.key.participant : meLidNormalised
                 const reactionJid = message.key?.participant ? message.key.participant : creationMsgKey.participant ? creationMsgKey.participant : meLidNormalised
                 const reactionEncKey = reactMsg.messageContextInfo?.messageSecret