Fix/Adjust remote message key handling in WhatsApp service to include alternative JID

[ricaelchiquetti]

The 'messages.upsert' event handler was not correctly handling the 'remoteJid' for messages that contained an alternative identifier ('remoteJidAlt'), such as those from LIDs ('@lid'). This resulted in webhooks being sent and internal processing using a temporary JID instead of the user's real JID.

The logic to replace 'remoteJid' with 'remoteJidAlt' already existed in the 'messages.update' handler but was missing from 'messages.upsert'.

This commit introduces a check in the 'messages.upsert' flow. After the message is prepared, the code now checks if the 'remoteJid' contains '@lid' and if 'remoteJidAlt' is present. If both are true, the 'remoteJid' of the message object ('messageRaw') is updated before being sent to webhooks, logs, and the chatbot controller.

This ensures consistency in JID handling across the application, guaranteeing that the correct contact identifier is used in all processing flows.

Summary by Sourcery

Bug Fixes:

• Handle alternative JID in messages.upsert by replacing temporary '@lid' remoteJid with remoteJidAlt before webhooks and processing

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adds a conditional block in the WhatsApp service’s messages.upsert handler to detect and replace temporary LID-based JIDs with their alternative real JIDs before further processing, aligning its behavior with the existing messages.update flow.

Sequence diagram for updated remoteJid handling in messages.upsert

sequenceDiagram
    participant WhatsAppService
    participant Message
    participant Webhook
    participant Logger
    participant ChatbotController

    WhatsAppService->>Message: Prepare messageRaw
    alt remoteJid contains '@lid' and remoteJidAlt exists
        WhatsAppService->>Message: Replace remoteJid with remoteJidAlt
    end
    WhatsAppService->>Logger: Log messageRaw
    WhatsAppService->>Webhook: sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw)
    WhatsAppService->>ChatbotController: Process messageRaw

Loading

Class diagram for message key structure update

classDiagram
    class MessageKey {
        remoteJid: string
        remoteJidAlt: string
    }
    class MessageRaw {
        key: MessageKey
    }
    MessageRaw --> MessageKey

Loading

File-Level Changes

Change	Details	Files
Swap temporary '@lid' JID for the real JID in upsert flow	Detect when messageRaw.key.remoteJid contains '@lid' and remoteJidAlt is present Reassign messageRaw.key.remoteJid to the value of remoteJidAlt Continue with logging, webhook dispatch, and chatbot handling using the updated JID	src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

Possibly linked issues

• Problemas ao enviar mídias para o Celular usando o Typebot ou Postman #123: PR updates 'messages.upsert' to replace '@lid' in 'remoteJid' with 'remoteJidAlt', resolving the issue of incorrect JID handling.
• Docker folder is deleted #1: PR updates messages.upsert to use remoteJidAlt when remoteJid has '@lid', fixing the incorrect WhatsApp ID.
• Problemas ao enviar mídias para o Celular usando o Typebot ou Postman #123: The PR updates remoteJid from @lid to remoteJidAlt in messages.upsert, resolving the issue of incorrect contact IDs for Android users.

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey there - I've reviewed your changes and they look great!

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}