Skip to content

fix(whatsapp): restore reply/quote contextInfo in prepareMessage #2654

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

Open
diegocesarmg wants to merge 1 commit into
base: develop
Choose a base branch
from
+10 −2
Open

fix(whatsapp): restore reply/quote contextInfo in prepareMessage #2654

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
12 changes: 10 additions & 2 deletions src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5155,6 +5155,8 @@ export class BaileysStartupService extends ChannelStartupService {

private prepareMessage(message: WAMessage): Message {
const keyAny = message.key as any;
const contentType = getContentType(message.message);
const contentMsg = contentType ? (message.message?.[contentType] as any) : undefined;
const messageRaw: any = {
key: {
...message.key,
Expand All @@ -5167,14 +5169,20 @@ export class BaileysStartupService extends ChannelStartupService {
? 'Você'
: message?.participant || (message.key?.participant ? message.key.participant.split('@')[0] : null)),
message: this.deserializeMessageBuffers({ ...message.message }),
messageType: getContentType(message.message),
messageType: contentType,
messageTimestamp: Long.isLong(message.messageTimestamp)
? message.messageTimestamp.toNumber()
: (message.messageTimestamp as number),
source: getDevice(keyAny.id),
instanceId: this.instanceId,
status: status[message.status],
contextInfo: this.deserializeMessageBuffers(message.message?.messageContextInfo),
// The quote/reply context lives on the content node (e.g.
// extendedTextMessage.contextInfo), not on the top-level
// messageContextInfo (which only carries device/encryption metadata).
// Reading it from the content node keeps stanzaId/participant/quotedMessage
// available after the extendedTextMessage node is flattened below — this
// is how it worked through v2.3.7 and what downstream reply handling expects.
contextInfo: this.deserializeMessageBuffers(contentMsg?.contextInfo ?? message.message?.messageContextInfo),
};

if (!messageRaw.status && message.key.fromMe === false) {
Expand Down