fix(send): handle document-with-caption and @lid JIDs in mentionAll - #137
Open
cesar-carlos wants to merge 1 commit into
Open
fix(send): handle document-with-caption and @lid JIDs in mentionAll#137cesar-carlos wants to merge 1 commit into
cesar-carlos wants to merge 1 commit into
Conversation
Document+caption moves DocumentMessage under DocumentWithCaptionMessage but mentionAll still wrote ContextInfo on the nil pointer. Prefer PhoneNumber over LID when building mention JIDs. Closes evolution-foundation#114 Co-authored-by: Cursor <cursoragent@cursor.com>
Reviewer's GuideRefactors how MentionedJID is set on outgoing messages, fixes crashes when sending document-with-caption messages with mentions, and ensures mention-all uses phone-number JIDs instead of @lid JIDs, with new helpers and unit tests to cover the behavior. Sequence diagram for mentionAll handling with document-with-caption messagessequenceDiagram
actor Client
participant SendService
participant GroupInfo
participant MentionHelpers
participant WAMessage
Client->>SendService: SendMessage(instance, msg)
SendService->>GroupInfo: groupInfo.Participants
loop participants
SendService->>MentionHelpers: participantMentionJID(participant)
MentionHelpers-->>SendService: mentionJID
end
SendService->>MentionHelpers: setMessageMentionedJIDs(msg, messageType, mentionedJIDs)
alt [messageType is DocumentMessage]
alt [message has DocumentMessage]
MentionHelpers->>WAMessage: msg.DocumentMessage.ContextInfo.MentionedJID = mentionedJIDs
else [message has DocumentWithCaptionMessage]
MentionHelpers->>WAMessage: msg.DocumentWithCaptionMessage.Message.DocumentMessage.ContextInfo.MentionedJID = mentionedJIDs
end
else [other message types]
MentionHelpers->>WAMessage: <type>.ContextInfo.MentionedJID = mentionedJIDs
end
File-Level Changes
Assessment against linked issues
Possibly linked issues
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Hey - I've left some high level feedback:
setMessageMentionedJIDsrelies on themessageTypestring; consider refactoring callers to pass a more structured enum/constant or derive the type from the populated message field to avoid bugs from typos or mismatches between the string and the actual message content.- In
setMessageMentionedJIDs, it might be useful to handle or log unexpected/unsupportedmessageTypevalues (e.g., via a default case) so that future message types fail visibly instead of silently doing nothing.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- `setMessageMentionedJIDs` relies on the `messageType` string; consider refactoring callers to pass a more structured enum/constant or derive the type from the populated message field to avoid bugs from typos or mismatches between the string and the actual message content.
- In `setMessageMentionedJIDs`, it might be useful to handle or log unexpected/unsupported `messageType` values (e.g., via a default case) so that future message types fail visibly instead of silently doing nothing.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
ecosb2b
pushed a commit
to ecosb2b/evo-go-v2
that referenced
this pull request
Aug 5, 2026
Merges the Athene fork, which sits 11 commits ahead of the same upstream base and had already solved — in production — the three problems this fork was working through, plus a batch of upstream PRs we had not picked up. Only pkg/whatsmeow/service/whatsmeow.go conflicted (6 hunks); the other 63 files merged cleanly. Every conflict was resolved in favour of the incoming version, because each one was a place where both forks fixed the same bug and theirs is the one we chose to keep: - Connection leak: their getAuthContainer/sharedAuthContainer replaces our storeContainer/storeContainerHolder. Same fix, but theirs is a backport of upstream PR evolution-foundation#117, so it will converge with upstream instead of conflicting when that PR merges. It also caps SQLite at MaxOpenConns(1), which ours did not. - Reconnection: their runtime supervisor replaces our EnableAutoReconnect=true. Ours stopped the automatic disconnect loop but left ReconnectClient reachable from the API endpoint and the send retry, so those paths could still spawn a second client. Their runtime token refuses to start a second runtime for an instance from any path, waits for the previous goroutine to exit, deduplicates concurrent reconnects, backs off exponentially with jitter, and probes to confirm the reconnect actually connected. - Shared maps: ClientMapsMu closes the "fatal error: concurrent map writes" hole, which was still open on our side and kills the whole process rather than panicking a single request. Also arriving with the merge: upstream PRs evolution-foundation#149, evolution-foundation#135, evolution-foundation#34, evolution-foundation#100, evolution-foundation#143, evolution-foundation#137, evolution-foundation#120, evolution-foundation#130, evolution-foundation#151 and evolution-foundation#122; multi-webhook fan-out; POST /send/product; POST /user/savecontact; GET /server/stats and the dashboard; the whatsmeow update to 20260721; and removal of the 61 MB compiled binary that was tracked in git. Our GHCR workflow did not conflict and is preserved. store_container_test.go was adapted to the incoming implementation: it now exercises getAuthContainer, asserts against their MaxOpenConns of 20, and resets sharedAuthContainer between tests, since that container is a package-level global and would otherwise carry between tests and invalidate the pg_stat_activity measurements. It is kept alongside their auth_container_retry_test.go because it measures something theirs does not: the connection count the server actually sees. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
/send/mediasends a document with caption together withmentionAll/mentionedJid(DocumentMessage is moved underDocumentWithCaptionMessagebut ContextInfo was still written on the nil pointer).participant.PhoneNumberover@lidJID when buildingmentionAlllists (WhatsApp mentions need@s.whatsapp.net).setMessageMentionedJIDs/participantMentionJIDhelpers and add unit tests.Closes #114
Test plan
go test ./pkg/sendMessage/service/ -run 'TestParticipantMentionJID|TestSetMessageMentionedJIDs'go vet ./pkg/sendMessage/service/POST /send/mediato a group withtype=document, caption,mentionAll=truereturns 200 and notifies participantstype=image+ caption +mentionAll=trueMade with Cursor
Summary by Sourcery
Fix mention handling for group messages, especially documents with captions, and centralize mention JID selection and assignment logic.
Bug Fixes:
Enhancements:
Tests: