Skip to content

Commit 7e996ad

Browse files
committed
fix: change Baileys version, fixed problem to receive csat in chatwoot
1 parent 0b07fb6 commit 7e996ad

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@ffmpeg-installer/ffmpeg": "^1.1.0",
4545
"@figuro/chatwoot-sdk": "^1.1.14",
4646
"@hapi/boom": "^10.0.1",
47-
"@whiskeysockets/baileys": "github:DavidsonGomes/Baileys",
47+
"@whiskeysockets/baileys": "^6.4.0",
4848
"axios": "^1.3.5",
4949
"class-validator": "^0.13.2",
5050
"compression": "^1.7.4",

src/whatsapp/services/chatwoot.service.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,12 @@ export class ChatwootService {
10961096
}
10971097
}
10981098

1099-
if (body.message_type === 'template' && body.content_type === 'input_csat') {
1099+
if (
1100+
body.message_type === 'template' &&
1101+
body.content_type === 'input_csat' &&
1102+
body.event === 'message_created'
1103+
) {
1104+
console.log(body);
11001105
this.logger.verbose('check if is csat');
11011106

11021107
const data: SendTextDto = {

src/whatsapp/services/whatsapp.service.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,6 +1305,7 @@ export class WAStartupService {
13051305
const regexp = new RegExp(/^(\d{2})(\d{2})\d{1}(\d{8})$/);
13061306
if (regexp.test(jid)) {
13071307
const match = regexp.exec(jid);
1308+
13081309
if (match && (match[1] === '52' || match[1] === '54')) {
13091310
const joker = Number.parseInt(match[3][0]);
13101311
const ddd = Number.parseInt(match[2]);
@@ -1360,6 +1361,7 @@ export class WAStartupService {
13601361
}
13611362

13621363
const formattedMXARNumber = this.formatMXOrARNumber(number);
1364+
console.log(formattedMXARNumber, number);
13631365

13641366
if (formattedMXARNumber !== number) {
13651367
this.logger.verbose(
@@ -1491,7 +1493,7 @@ export class WAStartupService {
14911493
!message['poll'] &&
14921494
!message['sticker'] &&
14931495
!message['conversation'] &&
1494-
!sender.includes('@broadcast')
1496+
sender !== 'status@broadcast'
14951497
) {
14961498
if (!message['audio']) {
14971499
this.logger.verbose('Sending message');
@@ -1521,7 +1523,7 @@ export class WAStartupService {
15211523
);
15221524
}
15231525

1524-
if (sender.includes('@broadcast')) {
1526+
if (sender === 'status@broadcast') {
15251527
this.logger.verbose('Sending message');
15261528
return await this.client.sendMessage(
15271529
sender,

0 commit comments

Comments
 (0)