From 6f6e798700b9ef2d64b441eebca6c76368a534d1 Mon Sep 17 00:00:00 2001
From: Gabriel Jablonski <gabriel@fazer.ai>
Date: Fri, 25 Jul 2025 09:40:35 -0300
Subject: [PATCH] fix: handle `senderPn` for LID JID type messages (#85)

* fix: handle phone number from LID JID type

* test!

* fix: correct condition for jid_type in handle_message method
---
 .../whatsapp/baileys_handlers/helpers.rb      |  6 ++++-
 .../baileys_handlers/messages_upsert.rb       |  5 ++--
 .../incoming_message_baileys_service_spec.rb  | 23 +++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/services/whatsapp/baileys_handlers/helpers.rb b/app/services/whatsapp/baileys_handlers/helpers.rb
index e507d1c51..000be4d3a 100644
--- a/app/services/whatsapp/baileys_handlers/helpers.rb
+++ b/app/services/whatsapp/baileys_handlers/helpers.rb
@@ -116,9 +116,13 @@ module Whatsapp::BaileysHandlers::Helpers # rubocop:disable Metrics/ModuleLength
   end
 
   def phone_number_from_jid
+    reference_field = jid_type == 'lid' ? :senderPn : :remoteJid
+    jid = @raw_message[:key][reference_field]
+    return unless jid
+
     # NOTE: jid shape is `<user>_<agent>:<device>@<server>`
     # https://github.com/WhiskeySockets/Baileys/blob/v6.7.16/src/WABinary/jid-utils.ts#L19
-    @raw_message[:key][:remoteJid].split('@').first.split(':').first.split('_').first
+    jid.split('@').first.split(':').first.split('_').first
   end
 
   def contact_name
diff --git a/app/services/whatsapp/baileys_handlers/messages_upsert.rb b/app/services/whatsapp/baileys_handlers/messages_upsert.rb
index 1d3f086d2..d7742f874 100644
--- a/app/services/whatsapp/baileys_handlers/messages_upsert.rb
+++ b/app/services/whatsapp/baileys_handlers/messages_upsert.rb
@@ -20,8 +20,9 @@ module Whatsapp::BaileysHandlers::MessagesUpsert
     end
   end
 
-  def handle_message
-    return if jid_type != 'user'
+  def handle_message # rubocop:disable Metrics/CyclomaticComplexity
+    return unless %w[lid user].include?(jid_type)
+    return if jid_type == 'lid' && !phone_number_from_jid
     return if ignore_message?
     return if find_message_by_source_id(raw_message_id) || message_under_process?
 
diff --git a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
index b1cb46799..d755b7d94 100644
--- a/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_baileys_service_spec.rb
@@ -690,6 +690,29 @@ describe Whatsapp::IncomingMessageBaileysService do
           expect(second_message.content).to eq('Hello from another user')
         end
       end
+
+      context 'when jid type is lid' do
+        it 'processes the message with phone number from lid jid type' do
+          raw_message[:key][:remoteJid] = '12345678@lid'
+          raw_message[:key][:senderPn] = '5511912345678@s.whatsapp.net'
+
+          described_class.new(inbox: inbox, params: params).perform
+
+          conversation = inbox.conversations.last
+          message = conversation.messages.last
+
+          expect(message).to be_present
+          expect(conversation.contact.phone_number).to eq('+5511912345678')
+        end
+      end
+
+      it 'skips message if senderPn is not present' do
+        raw_message[:key][:remoteJid] = '12345678@lid'
+
+        described_class.new(inbox: inbox, params: params).perform
+
+        expect(inbox.conversations).to be_empty
+      end
     end
 
     context 'when processing messages.update event' do