Skip to content

Commit ade3952

Browse files
committed
fix: Fixed issue sending contact to Chatwoot via iOS
1 parent f246516 commit ade3952

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* Correction of chatwoot functioning with admin flows
2828
* Fixed problem that did not generate qrcode with the chatwoot_conversation_pending option enabled
2929
* Fixed issue where CSAT opened a new ticket when reopen_conversation was disabled
30+
* Fixed issue sending contact to Chatwoot via iOS
3031

3132
### Integrations
3233

src/whatsapp/services/chatwoot.service.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1373,6 +1373,11 @@ export class ChatwootService {
13731373
formattedContact += `\n**number ${numberCount}:** ${phoneNumber}`;
13741374
numberCount++;
13751375
}
1376+
if (key.includes('TEL')) {
1377+
const phoneNumber = contactInfo[key];
1378+
formattedContact += `\n**number:** ${phoneNumber}`;
1379+
numberCount++;
1380+
}
13761381
});
13771382

13781383
this.logger.verbose('message content: ' + formattedContact);
@@ -1401,6 +1406,11 @@ export class ChatwootService {
14011406
formattedContact += `\n**number ${numberCount}:** ${phoneNumber}`;
14021407
numberCount++;
14031408
}
1409+
if (key.includes('TEL')) {
1410+
const phoneNumber = contactInfo[key];
1411+
formattedContact += `\n**number:** ${phoneNumber}`;
1412+
numberCount++;
1413+
}
14041414
});
14051415

14061416
return formattedContact;
@@ -1458,7 +1468,7 @@ export class ChatwootService {
14581468
this.logger.verbose('get conversation message');
14591469
const bodyMessage = await this.getConversationMessage(body.message);
14601470

1461-
if (bodyMessage.includes('Por favor, classifique esta conversa, http')) {
1471+
if (bodyMessage && bodyMessage.includes('Por favor, classifique esta conversa, http')) {
14621472
this.logger.verbose('conversation is closed');
14631473
return;
14641474
}

src/whatsapp/services/whatsapp.service.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,11 +1795,12 @@ export class WAStartupService {
17951795

17961796
if ((this.localTypebot.enabled && type === 'notify') || typebotSessionRemoteJid) {
17971797
if (!(this.localTypebot.listening_from_me === false && messageRaw.key.fromMe === true)) {
1798-
await this.typebotService.sendTypebot(
1799-
{ instanceName: this.instance.name },
1800-
messageRaw.key.remoteJid,
1801-
messageRaw,
1802-
);
1798+
if (messageRaw.messageType !== 'reactionMessage')
1799+
await this.typebotService.sendTypebot(
1800+
{ instanceName: this.instance.name },
1801+
messageRaw.key.remoteJid,
1802+
messageRaw,
1803+
);
18031804
}
18041805
}
18051806

0 commit comments

Comments
 (0)