Skip to content
Closed
Changes from 1 commit
Commits
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
53 changes: 35 additions & 18 deletions src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4250,24 +4250,41 @@ export class BaileysStartupService extends ChannelStartupService {
}

private prepareMessage(message: proto.IWebMessageInfo): any {
const contentType = getContentType(message.message);
const contentMsg = message?.message[contentType] as any;

const messageRaw = {
key: message.key,
pushName:
message.pushName ||
(message.key.fromMe
? 'Você'
: message?.participant || (message.key?.participant ? message.key.participant.split('@')[0] : null)),
status: status[message.status],
message: { ...message.message },
contextInfo: contentMsg?.contextInfo,
messageType: contentType || 'unknown',
messageTimestamp: message.messageTimestamp as number,
instanceId: this.instanceId,
source: getDevice(message.key.id),
};
const contentType = getContentType(message.message);
const contentMsg = message?.message[contentType] as any;

// [ADD] Merge seguro de contextInfo
const mm = message.message as Record<string, any> | undefined;
const contentCtx =
contentType && mm && typeof mm[contentType] === 'object'
? mm[contentType]?.contextInfo
: undefined;

const mergedContext: Record<string, any> = {
...(contentCtx || {}),
...(message.message?.contextInfo || {}),
...(message.messageContextInfo || {}),
};

const contextInfoFinal = Object.keys(mergedContext).length > 0 ? mergedContext : undefined;

const messageRaw = {
key: message.key,
pushName:
message.pushName ||
(message.key.fromMe
? 'Você'
: message?.participant ||
(message.key?.participant ? message.key.participant.split('@')[0] : null)),
status: status[message.status],
message: { ...message.message },
// [REPLACE] antes: contextInfo: contentMsg?.contextInfo,
contextInfo: contextInfoFinal,
messageType: contentType || 'unknown',
messageTimestamp: message.messageTimestamp as number,
instanceId: this.instanceId,
source: getDevice(message.key.id),
};

if (!messageRaw.status && message.key.fromMe === false) {
messageRaw.status = status[3]; // DELIVERED MESSAGE
Expand Down