Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(engine): keep the quote and mentions of any Baileys reply

Yudhi Armyndharis2a4c801b7228
diff --git a/src/engine/adapters/baileys-context-carriers.spec.ts b/src/engine/adapters/baileys-context-carriers.spec.ts
new file mode 100644
index 000000000..e7f4c80e9
--- /dev/null
+++ b/src/engine/adapters/baileys-context-carriers.spec.ts
@@ -0,0 +1,73 @@
+import type { WAMessage } from '@whiskeysockets/baileys';
+import type { IncomingMessage } from '../interfaces/whatsapp-engine.interface';
+import { BaileysHistory, BaileysHistoryHost } from './baileys-history';
+import { extractBaileysContext } from './baileys-message-mapper';
+
+const contextInfo = {
+ stanzaId: 'QUOTED1',
+ quotedMessage: { conversation: 'original' },
+ mentionedJid: ['[email protected]'],
+};
+
+describe('quote and mentions on a content type without a dedicated carrier', () => {
+ it.each([
+ ['a contact card', { contactMessage: { vcard: 'BEGIN:VCARD', contextInfo } }],
+ ['a live location', { liveLocationMessage: { degreesLatitude: 1, degreesLongitude: 2, contextInfo } }],
+ ['a poll', { pollCreationMessageV3: { name: 'Q', contextInfo } }],
+ [
+ 'a poll in a V4 wrapper',
+ { pollCreationMessageV4: { message: { pollCreationMessage: { name: 'Q', contextInfo } } } },
+ ],
+ ])('reads them from %s', (_name, content) => {
+ expect(extractBaileysContext(content)).toMatchObject({
+ quotedMessage: { id: 'QUOTED1', body: 'original' },
+ mentionedJids: ['[email protected]'],
+ });
+ });
+
+ it('prefers the carrier a text or media message uses', () => {
+ const context = extractBaileysContext({
+ extendedTextMessage: { contextInfo: { ...contextInfo, stanzaId: 'FROM-TEXT' } },
+ contactMessage: { contextInfo },
+ });
+
+ expect(context.quotedMessage?.id).toBe('FROM-TEXT');
+ });
+});
+
+describe('quote and mentions on a history message', () => {
+ it('maps them like a live message', async () => {
+ const received: IncomingMessage[][] = [];
+ const host = {
+ loadLib: () =>
+ Promise.resolve({
+ normalizeMessageContent: (m: unknown) => m,
+ getContentType: (m: object) => Object.keys(m)[0],
+ proto: { Message: { ProtocolMessage: { Type: { REVOKE: 0 } } } },
+ }),
+ normalizedSelfJid: () => '[email protected]',
+ toNeutralJid: (id: string) => id,
+ extractEphemeralDuration: () => undefined,
+ recordMessage: jest.fn(),
+ recordMessageEdit: jest.fn(),
+ upsertContacts: jest.fn(),
+ getOnHistoryMessages: () => (messages: IncomingMessage[]) => {
+ received.push(messages);
+ },
+ applyHistoryRevoke: (key: WAMessage['key']) => Promise.resolve(key),
+ } as unknown as BaileysHistoryHost;
+
+ await new BaileysHistory(host).captureHistoryMessages([
+ {
+ key: { id: 'H1', remoteJid: '[email protected]', fromMe: false },
+ message: { extendedTextMessage: { text: 'reply', contextInfo } },
+ messageTimestamp: 100,
+ },
+ ] as WAMessage[]);
+
+ expect(received[0][0]).toMatchObject({
+ quotedMessage: { id: 'QUOTED1', body: 'original' },
+ mentionedIds: ['[email protected]'],
+ });
+ });
+});
diff --git a/src/engine/adapters/baileys-history.ts b/src/engine/adapters/baileys-history.ts
index 23d3975e5..73dae8d6e 100644
--- a/src/engine/adapters/baileys-history.ts
+++ b/src/engine/adapters/baileys-history.ts
@@ -9,6 +9,7 @@ import {
extractBaileysButtonReply,
extractBaileysButtons,
extractBaileysCommerce,
+ extractBaileysContext,
extractBaileysPoll,
isBaileysCatalogShare,
keyParticipant,
@@ -315,6 +316,7 @@ export class BaileysHistory {
return null;
}
const body = extractBaileysBody(content);
+ const context = extractBaileysContext(content);
const commerce = extractBaileysCommerce(content, contentType);
const button = extractBaileysButtonReply(content, contentType);
const buttons = extractBaileysButtons(content, contentType);
@@ -336,6 +338,8 @@ export class BaileysHistory {
poll: extractBaileysPoll(content),
button,
buttons,
+ quotedMessage: context.quotedMessage,
+ mentionedJids: context.mentionedJids,
isCatalogShare: isBaileysCatalogShare(content),
// Populate the disappearing-messages timer using the same extraction the live path and the
// session-store cache share (`msg.ephemeralDuration` primary, `contextInfo.expiration` fallback),
diff --git a/src/engine/adapters/baileys-message-mapper.ts b/src/engine/adapters/baileys-message-mapper.ts
index 51c164199..d497852f0 100644
--- a/src/engine/adapters/baileys-message-mapper.ts
+++ b/src/engine/adapters/baileys-message-mapper.ts
@@ -881,6 +881,14 @@ export interface BaileysContextContent {
templateButtonReplyMessage?: BaileysContextCarrier | null;
listResponseMessage?: BaileysContextCarrier | null;
interactiveResponseMessage?: BaileysContextCarrier | null;
+ /** Content types that carry a `contextInfo` of their own and have no extractor beyond it. */
+ contactMessage?: BaileysContextCarrier | null;
+ contactsArrayMessage?: BaileysContextCarrier | null;
+ liveLocationMessage?: BaileysContextCarrier | null;
+ pollCreationMessage?: BaileysContextCarrier | null;
+ pollCreationMessageV2?: BaileysContextCarrier | null;
+ pollCreationMessageV3?: BaileysContextCarrier | null;
+ pollCreationMessageV5?: BaileysContextCarrier | null;
/** A poll wrapper; the poll inside it carries the `contextInfo`. */
pollCreationMessageV4?: { message?: object | null } | null;
}
@@ -923,16 +931,16 @@ export function extractBaileysContext(content: BaileysContextContent): BaileysMe
// A text status's styling rides on the extended-text content (proto backgroundArgb/font) —
// surface it so the store/viewer can render the story the way it was posted.
const extText = content.extendedTextMessage;
- const contextInfo = subForContext?.contextInfo;
- // WhatsApp stamps the timer on every message in a disappearing chat, a product, poll, contact card, live
- // location, order or event included, so any content node answers when the carriers above have none.
- // A V4 poll's node is one level down, inside its wrapper.
+ // A reply can be a poll, contact card, live location, order or event as well, and WhatsApp stamps the
+ // timer on every message in a disappearing chat, so any content node answers when the carriers above
+ // have none. A V4 poll's node is one level down, inside its wrapper.
+ const contexts = Object.values(content)
+ .concat(Object.values(content.pollCreationMessageV4?.message ?? {}))
+ .map(node => (node as BaileysContextCarrier | null | undefined)?.contextInfo);
+ const contextInfo = subForContext?.contextInfo ?? contexts.find(info => info != null);
const expiration =
contextInfo?.expiration ??
- Object.values(content)
- .concat(Object.values(content.pollCreationMessageV4?.message ?? {}))
- .map(node => (node as BaileysContextCarrier | null | undefined)?.contextInfo?.expiration)
- .find((e): e is number => typeof e === 'number' && e > 0);
+ contexts.map(info => info?.expiration).find((e): e is number => typeof e === 'number' && e > 0);
const context: BaileysMessageContext = {
ephemeralDuration: expiration ?? undefined,