Skip to content

Commit f46699e

Browse files
committed
fix(baileys): cast messageRaw and its properties to any for type safety
1 parent 72b0833 commit f46699e

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,12 +1564,11 @@ export class BaileysStartupService extends ChannelStartupService {
15641564
const readChatToUpdate: Record<string, true> = {}; // {remoteJid: true}
15651565

15661566
for await (const { key, update } of args) {
1567-
// Normalize JIDs immediately to ensure consistent DB lookups
15681567
const keyAny = key as any;
1569-
if (keyAny.remoteJid) keyAny.remoteJid = keyAny.remoteJid.replace(/:.*$/, '');
1570-
if (keyAny.participant) keyAny.participant = keyAny.participant.replace(/:.*$/, '');
1568+
const normalizedRemoteJid = keyAny.remoteJid?.replace(/:.*$/, '');
1569+
const normalizedParticipant = keyAny.participant?.replace(/:.*$/, '');
15711570

1572-
if (settings?.groupsIgnore && keyAny.remoteJid?.includes('@g.us')) {
1571+
if (settings?.groupsIgnore && normalizedRemoteJid?.includes('@g.us')) {
15731572
continue;
15741573
}
15751574

@@ -1620,9 +1619,9 @@ export class BaileysStartupService extends ChannelStartupService {
16201619

16211620
const message: any = {
16221621
keyId: key.id,
1623-
remoteJid: keyAny?.remoteJid?.replace(/:.*$/, ''),
1622+
remoteJid: normalizedRemoteJid,
16241623
fromMe: key.fromMe,
1625-
participant: keyAny?.participant?.replace(/:.*$/, ''),
1624+
participant: normalizedParticipant,
16261625
status: status[update.status] ?? 'SERVER_ACK',
16271626
pollUpdates,
16281627
instanceId: this.instanceId,
@@ -4679,12 +4678,20 @@ export class BaileysStartupService extends ChannelStartupService {
46794678
remoteJid: keyAny.remoteJid?.replace(/:.*$/, ''),
46804679
participant: keyAny.participant?.replace(/:.*$/, ''),
46814680
},
4682-
pushName: message.pushName,
4683-
message: message.message,
4681+
pushName:
4682+
message.pushName ||
4683+
(message.key.fromMe
4684+
? 'Você'
4685+
: message?.participant || (message.key?.participant ? message.key.participant.split('@')[0] : null)),
4686+
message: this.deserializeMessageBuffers({ ...message.message }),
46844687
messageType: getContentType(message.message),
4685-
messageTimestamp: message.messageTimestamp,
4688+
messageTimestamp: Long.isLong(message.messageTimestamp)
4689+
? message.messageTimestamp.toNumber()
4690+
: (message.messageTimestamp as number),
46864691
source: getDevice(keyAny.id),
46874692
instanceId: this.instanceId,
4693+
status: status[message.status],
4694+
contextInfo: this.deserializeMessageBuffers(message.message?.messageContextInfo),
46884695
};
46894696

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

0 commit comments

Comments
 (0)