From ef8d1a09fbf1fc6b0d0edcbaf2ea91c8c07102b2 Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Sun, 1 Oct 2023 14:40:40 +0000 Subject: [PATCH] support mesasge input from lid --- src/Socket/messages-recv.ts | 1 + src/Utils/decode-wa-message.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts index 1c4d93a..8d52009 100644 --- a/src/Socket/messages-recv.ts +++ b/src/Socket/messages-recv.ts @@ -655,6 +655,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => { const { fullMessage: msg, category, author, decrypt } = decryptMessageNode( node, authState.creds.me!.id, + authState.creds.me!.lid || '', signalRepository, logger, ) diff --git a/src/Utils/decode-wa-message.ts b/src/Utils/decode-wa-message.ts index 132cb58..4b8537e 100644 --- a/src/Utils/decode-wa-message.ts +++ b/src/Utils/decode-wa-message.ts @@ -15,7 +15,8 @@ type MessageType = 'chat' | 'peer_broadcast' | 'other_broadcast' | 'group' | 'di */ export function decodeMessageNode( stanza: BinaryNode, - meId: string + meId: string, + meLid: string ) { let msgType: MessageType let chatId: string @@ -27,6 +28,7 @@ export function decodeMessageNode( const recipient: string | undefined = stanza.attrs.recipient const isMe = (jid: string) => areJidsSameUser(jid, meId) + const isMeLid = (jid: string) => areJidsSameUser(jid, meLid) if(isJidUser(from)) { if(recipient) { @@ -43,7 +45,7 @@ export function decodeMessageNode( author = from } else if(isLidUser(from)) { if(recipient) { - if(!isMe(from)) { + if(!isMeLid(from)) { throw new Boom('receipient present, but msg not from me', { data: stanza }) } @@ -111,10 +113,11 @@ export function decodeMessageNode( export const decryptMessageNode = ( stanza: BinaryNode, meId: string, + meLid: string, repository: SignalRepository, logger: Logger ) => { - const { fullMessage, author, sender } = decodeMessageNode(stanza, meId) + const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid) return { fullMessage, category: stanza.attrs.category,