Skip to content

feat(whatsapp): surface quoted reply metadata from Baileys #25398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kfa-ai wants to merge 1 commit into from
Closed

feat(whatsapp): surface quoted reply metadata from Baileys #25398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion scripts/whatsapp-bridge/bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,10 @@ async function startSocket() {
const messageContent = getMessageContent(msg);
const contextInfo = getContextInfo(messageContent);
const mentionedIds = Array.from(new Set((contextInfo?.mentionedJid || []).map(normalizeWhatsAppId).filter(Boolean)));
const quotedParticipant = normalizeWhatsAppId(contextInfo?.participant || contextInfo?.remoteJid || '');
const quotedMessageId = contextInfo?.stanzaId || null;
const quotedParticipant = normalizeWhatsAppId(contextInfo?.participant || '') || null;
const quotedRemoteJid = normalizeWhatsAppId(contextInfo?.remoteJid || '') || null;
const hasQuotedMessage = !!contextInfo?.quotedMessage;

// Extract message body
let body = '';
Expand Down Expand Up @@ -412,7 +415,10 @@ async function startSocket() {
mediaType,
mediaUrls,
mentionedIds,
quotedMessageId,
quotedParticipant,
quotedRemoteJid,
hasQuotedMessage,
botIds,
timestamp: msg.messageTimestamp,
};
Expand Down
39 changes: 39 additions & 0 deletions tests/gateway/test_whatsapp_formatting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ def _make_adapter():
adapter._message_queue = asyncio.Queue()
adapter._http_session = MagicMock()
adapter._mention_patterns = []
adapter._dm_policy = "open"
adapter._allow_from = set()
adapter._group_policy = "open"
adapter._group_allow_from = set()
return adapter


Expand Down Expand Up @@ -287,6 +291,41 @@ async def test_not_connected_returns_failure(self):
assert "Not connected" in result.error


# ---------------------------------------------------------------------------
# bridge event metadata
# ---------------------------------------------------------------------------

class TestBridgeEventMetadata:
"""WhatsApp bridge metadata is preserved for downstream consumers."""

@pytest.mark.asyncio
async def test_quoted_reply_metadata_is_preserved_in_raw_message(self):
adapter = _make_adapter()
data = {
"messageId": "incoming-msg",
"chatId": "15551234567@s.whatsapp.net",
"senderId": "15551234567@s.whatsapp.net",
"senderName": "Tester",
"chatName": "Tester",
"isGroup": False,
"body": "approved",
"hasMedia": False,
"mediaUrls": [],
"quotedMessageId": "outbound-msg",
"quotedParticipant": "99999999999@s.whatsapp.net",
"quotedRemoteJid": "15551234567@s.whatsapp.net",
"hasQuotedMessage": True,
}

event = await adapter._build_message_event(data)

assert event is not None
assert event.raw_message["quotedMessageId"] == "outbound-msg"
assert event.raw_message["quotedParticipant"] == "99999999999@s.whatsapp.net"
assert event.raw_message["quotedRemoteJid"] == "15551234567@s.whatsapp.net"
assert event.raw_message["hasQuotedMessage"] is True


# ---------------------------------------------------------------------------
# display_config tier classification
# ---------------------------------------------------------------------------
Expand Down