From 6f08d55bb7da160bad82757ddef141a681134001 Mon Sep 17 00:00:00 2001 From: Rajeh Taher Date: Sun, 1 Oct 2023 14:19:37 +0000 Subject: [PATCH] reflect my own lid in relayMessage --- src/Socket/messages-send.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Socket/messages-send.ts b/src/Socket/messages-send.ts index 5cb35b3..f1f9fb4 100644 --- a/src/Socket/messages-send.ts +++ b/src/Socket/messages-send.ts @@ -304,8 +304,6 @@ export const makeMessagesSocket = (config: SocketConfig) => { message: proto.IMessage, { messageId: msgId, participant, additionalAttributes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: MessageRelayOptions ) => { - const meId = authState.creds.me!.id - let shouldIncludeDeviceIdentity = false const { user, server } = jidDecode(jid)! @@ -313,6 +311,7 @@ export const makeMessagesSocket = (config: SocketConfig) => { const isGroup = server === 'g.us' const isStatus = jid === statusJid const isLid = server === 'lid' + const meId = authState.creds.me![isLid ? 'lid' : 'id']! msgId = msgId || generateMessageID() useUserDevicesCache = useUserDevicesCache !== false @@ -378,7 +377,7 @@ export const makeMessagesSocket = (config: SocketConfig) => { devices.push(...additionalDevices) } - const patched = await patchMessageBeforeSending(message, devices.map(d => jidEncode(d.user, sock.user?.id?.includes?.(d.user) ? 'lid' : 's.whatsapp.net', d.device))) + const patched = await patchMessageBeforeSending(message, devices.map(d => jidEncode(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device))) const bytes = encodeWAMessage(patched) const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage(