From 4c006970a24c798a701c3a2adc1e573e0b8956be Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Tue, 25 Jul 2023 11:52:26 -0300 Subject: [PATCH 1/6] fix: Fixed chatwoot line wrap issue --- CHANGELOG.md | 6 ++++++ package.json | 2 +- src/whatsapp/services/chatwoot.service.ts | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 315ee04d..8eda7c55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.4.4 (homolog) + +### Fixed + +* Fixed chatwoot line wrap issue + # 1.4.3 (2023-07-25 10:51) ### Fixed diff --git a/package.json b/package.json index 716aeec4..8cfd9f8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "evolution-api", - "version": "1.4.3", + "version": "1.4.4", "description": "Rest api for communication with WhatsApp", "main": "./dist/src/main.js", "scripts": { diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index 6e55d145..39873651 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -1125,12 +1125,12 @@ export class ChatwootService { } if (body.message_type === 'template' && body.event === 'message_created') { - this.logger.verbose('check if is csat'); + this.logger.verbose('check if is template'); const data: SendTextDto = { number: chatId, textMessage: { - text: body.content, + text: body.content.replace(/\\\r\n|\\\n|\n/g, '\n'), }, options: { delay: 1200, From 89f40d54d979b38d0583275b8fc20665d35bff20 Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Tue, 25 Jul 2023 12:41:54 -0300 Subject: [PATCH 2/6] fix: Solved receive location in chatwoot --- CHANGELOG.md | 1 + src/whatsapp/services/chatwoot.service.ts | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eda7c55..4a2f5b55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### Fixed * Fixed chatwoot line wrap issue +* Solved receive location in chatwoot # 1.4.3 (2023-07-25 10:51) diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index 39873651..5a981238 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -13,6 +13,7 @@ import { SendAudioDto } from '../dto/sendMessage.dto'; import { SendMediaDto } from '../dto/sendMessage.dto'; import { ROOT_DIR } from '../../config/path.config'; import { ConfigService, HttpServer } from '../../config/env.config'; +import { type } from 'os'; export class ChatwootService { private messageCacheFile: string; @@ -1186,6 +1187,10 @@ export class ChatwootService { audioMessage: msg.audioMessage?.caption, contactMessage: msg.contactMessage?.vcard, contactsArrayMessage: msg.contactsArrayMessage, + locationMessage: + msg.locationMessage?.degreesLatitude + + ',' + + msg.locationMessage?.degreesLongitude, }; this.logger.verbose('type message: ' + types); @@ -1199,6 +1204,20 @@ export class ChatwootService { const result = typeKey ? types[typeKey] : undefined; + if (typeKey === 'locationMessage') { + const [latitude, longitude] = result.split(','); + + const formattedLocation = `**Location:** + **latitude:** ${latitude} + **longitude:** ${longitude} + https://www.google.com/maps/search/?api=1&query=${latitude},${longitude} + `; + + this.logger.verbose('message content: ' + formattedLocation); + + return formattedLocation; + } + if (typeKey === 'contactMessage') { const vCardData = result.split('\n'); const contactInfo = {}; From 14529f2c3580445a892a46dcdfdc25215e211d1a Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Tue, 25 Jul 2023 12:47:35 -0300 Subject: [PATCH 3/6] fix: When requesting the pairing code, it also brings the qr code --- CHANGELOG.md | 1 + src/whatsapp/services/whatsapp.service.ts | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a2f5b55..bb0fd7bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * Fixed chatwoot line wrap issue * Solved receive location in chatwoot +* When requesting the pairing code, it also brings the qr code # 1.4.3 (2023-07-25 10:51) diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 8959197e..370d9b64 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -242,13 +242,9 @@ export class WAStartupService { public get qrCode(): wa.QrCode { this.logger.verbose('Getting qrcode'); - if (this.instance.qrcode?.pairingCode) { - return { - pairingCode: this.instance.qrcode?.pairingCode, - }; - } return { + pairingCode: this.instance.qrcode?.pairingCode, code: this.instance.qrcode?.code, base64: this.instance.qrcode?.base64, }; From f0d8c2d0954bb5a5f9bf7e3db943b7b53bc6dbf9 Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Tue, 25 Jul 2023 13:19:15 -0300 Subject: [PATCH 4/6] fix: Solved receive location in chatwoot --- src/whatsapp/services/chatwoot.service.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index 5a981238..c660f6d6 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -1187,10 +1187,11 @@ export class ChatwootService { audioMessage: msg.audioMessage?.caption, contactMessage: msg.contactMessage?.vcard, contactsArrayMessage: msg.contactsArrayMessage, - locationMessage: - msg.locationMessage?.degreesLatitude + - ',' + - msg.locationMessage?.degreesLongitude, + locationMessage: !msg.protocolMessage + ? msg.locationMessage?.degreesLatitude + + ',' + + msg.locationMessage?.degreesLongitude + : undefined, }; this.logger.verbose('type message: ' + types); From aef92240cc09ab7c74574c24d5ab916de89c0bb6 Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Tue, 25 Jul 2023 15:20:21 -0300 Subject: [PATCH 5/6] fix: Option conversation_pending in chatwoot endpoint --- CHANGELOG.md | 2 + src/validate/validate.schema.ts | 21 ++++++++- .../controllers/chatwoot.controller.ts | 2 + .../controllers/instance.controller.ts | 24 ++++++++++ src/whatsapp/dto/chatwoot.dto.ts | 2 + src/whatsapp/dto/instance.dto.ts | 2 + src/whatsapp/models/chatwoot.model.ts | 2 + src/whatsapp/services/chatwoot.service.ts | 46 ++++++++++++++----- src/whatsapp/services/whatsapp.service.ts | 18 +++++++- src/whatsapp/types/wa.types.ts | 3 ++ 10 files changed, 107 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb0fd7bb..3922d284 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ * Fixed chatwoot line wrap issue * Solved receive location in chatwoot * When requesting the pairing code, it also brings the qr code +* Option reopen_conversation in chatwoot endpoint +* Option conversation_pending in chatwoot endpoint # 1.4.3 (2023-07-25 10:51) diff --git a/src/validate/validate.schema.ts b/src/validate/validate.schema.ts index 62b7e41c..d7e2ac1e 100644 --- a/src/validate/validate.schema.ts +++ b/src/validate/validate.schema.ts @@ -874,9 +874,26 @@ export const chatwootSchema: JSONSchema7 = { token: { type: 'string' }, url: { type: 'string' }, sign_msg: { type: 'boolean', enum: [true, false] }, + reopen_conversation: { type: 'boolean', enum: [true, false] }, + conversation_pending: { type: 'boolean', enum: [true, false] }, }, - required: ['enabled', 'account_id', 'token', 'url', 'sign_msg'], - ...isNotEmpty('account_id', 'token', 'url', 'sign_msg'), + required: [ + 'enabled', + 'account_id', + 'token', + 'url', + 'sign_msg', + 'reopen_conversation', + 'conversation_pending', + ], + ...isNotEmpty( + 'account_id', + 'token', + 'url', + 'sign_msg', + 'reopen_conversation', + 'conversation_pending', + ), }; export const settingsSchema: JSONSchema7 = { diff --git a/src/whatsapp/controllers/chatwoot.controller.ts b/src/whatsapp/controllers/chatwoot.controller.ts index d5e5e841..ad92e607 100644 --- a/src/whatsapp/controllers/chatwoot.controller.ts +++ b/src/whatsapp/controllers/chatwoot.controller.ts @@ -44,6 +44,8 @@ export class ChatwootController { data.token = ''; data.url = ''; data.sign_msg = false; + data.reopen_conversation = false; + data.conversation_pending = false; } data.name_inbox = instance.instanceName; diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts index 9be6ab5d..d9c351f7 100644 --- a/src/whatsapp/controllers/instance.controller.ts +++ b/src/whatsapp/controllers/instance.controller.ts @@ -42,6 +42,8 @@ export class InstanceController { chatwoot_token, chatwoot_url, chatwoot_sign_msg, + chatwoot_reopen_conversation, + chatwoot_conversation_pending, reject_call, msg_call, groups_ignore, @@ -169,6 +171,24 @@ export class InstanceController { throw new BadRequestException('Invalid "url" property in chatwoot'); } + if (chatwoot_sign_msg !== true && chatwoot_sign_msg !== false) { + throw new BadRequestException('sign_msg is required'); + } + + if ( + chatwoot_reopen_conversation !== true && + chatwoot_reopen_conversation !== false + ) { + throw new BadRequestException('reopen_conversation is required'); + } + + if ( + chatwoot_conversation_pending !== true && + chatwoot_conversation_pending !== false + ) { + throw new BadRequestException('conversation_pending is required'); + } + const urlServer = this.configService.get('SERVER').URL; try { @@ -180,6 +200,8 @@ export class InstanceController { sign_msg: chatwoot_sign_msg || false, name_inbox: instance.instanceName, number, + reopen_conversation: chatwoot_reopen_conversation || false, + conversation_pending: chatwoot_conversation_pending || false, }); this.chatwootService.initInstanceChatwoot( @@ -209,6 +231,8 @@ export class InstanceController { token: chatwoot_token, url: chatwoot_url, sign_msg: chatwoot_sign_msg || false, + reopen_conversation: chatwoot_reopen_conversation || false, + conversation_pending: chatwoot_conversation_pending || false, number, name_inbox: instance.instanceName, webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`, diff --git a/src/whatsapp/dto/chatwoot.dto.ts b/src/whatsapp/dto/chatwoot.dto.ts index a5026a46..b270c869 100644 --- a/src/whatsapp/dto/chatwoot.dto.ts +++ b/src/whatsapp/dto/chatwoot.dto.ts @@ -6,4 +6,6 @@ export class ChatwootDto { name_inbox?: string; sign_msg?: boolean; number?: string; + reopen_conversation?: boolean; + conversation_pending?: boolean; } diff --git a/src/whatsapp/dto/instance.dto.ts b/src/whatsapp/dto/instance.dto.ts index ca88a729..c317060f 100644 --- a/src/whatsapp/dto/instance.dto.ts +++ b/src/whatsapp/dto/instance.dto.ts @@ -16,4 +16,6 @@ export class InstanceDto { chatwoot_token?: string; chatwoot_url?: string; chatwoot_sign_msg?: boolean; + chatwoot_reopen_conversation?: boolean; + chatwoot_conversation_pending?: boolean; } diff --git a/src/whatsapp/models/chatwoot.model.ts b/src/whatsapp/models/chatwoot.model.ts index 54d9e051..bac226e9 100644 --- a/src/whatsapp/models/chatwoot.model.ts +++ b/src/whatsapp/models/chatwoot.model.ts @@ -10,6 +10,8 @@ export class ChatwootRaw { name_inbox?: string; sign_msg?: boolean; number?: string; + reopen_conversation?: boolean; + conversation_pending?: boolean; } const chatwootSchema = new Schema({ diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index c660f6d6..facea536 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -231,12 +231,19 @@ export class ChatwootService { if (qrcode) { this.logger.verbose('create conversation in chatwoot'); + const data = { + contact_id: contactId.toString(), + inbox_id: inboxId.toString(), + }; + + if (this.provider.conversation_pending) { + data['status'] = 'pending'; + } + + console.log('this.provider', this.provider); const conversation = await client.conversations.create({ accountId: this.provider.account_id, - data: { - contact_id: contactId.toString(), - inbox_id: inboxId.toString(), - }, + data, }); if (!conversation) { @@ -521,11 +528,20 @@ export class ChatwootService { })) as any; if (contactConversations) { + let conversation: any; + if (this.provider.reopen_conversation) { + conversation = contactConversations.payload.find( + (conversation) => conversation.inbox_id == filterInbox.id, + ); + } else { + conversation = contactConversations.payload.find( + (conversation) => + conversation.status !== 'resolved' && + conversation.inbox_id == filterInbox.id, + ); + } this.logger.verbose('return conversation if exists'); - const conversation = contactConversations.payload.find( - (conversation) => - conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id, - ); + if (conversation) { this.logger.verbose('conversation found'); return conversation.id; @@ -533,12 +549,18 @@ export class ChatwootService { } this.logger.verbose('create conversation in chatwoot'); + const data = { + contact_id: contactId.toString(), + inbox_id: filterInbox.id.toString(), + }; + + if (this.provider.conversation_pending) { + data['status'] = 'pending'; + } + const conversation = await client.conversations.create({ accountId: this.provider.account_id, - data: { - contact_id: `${contactId}`, - inbox_id: `${filterInbox.id}`, - }, + data, }); if (!conversation) { diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 370d9b64..ccefcfa0 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -312,6 +312,19 @@ export class WAStartupService { this.localChatwoot.sign_msg = data?.sign_msg; this.logger.verbose(`Chatwoot sign msg: ${this.localChatwoot.sign_msg}`); + this.localChatwoot.number = data?.number; + this.logger.verbose(`Chatwoot number: ${this.localChatwoot.number}`); + + this.localChatwoot.reopen_conversation = data?.reopen_conversation; + this.logger.verbose( + `Chatwoot reopen conversation: ${this.localChatwoot.reopen_conversation}`, + ); + + this.localChatwoot.conversation_pending = data?.conversation_pending; + this.logger.verbose( + `Chatwoot conversation pending: ${this.localChatwoot.conversation_pending}`, + ); + this.logger.verbose('Chatwoot loaded'); } @@ -323,6 +336,8 @@ export class WAStartupService { this.logger.verbose(`Chatwoot url: ${data.url}`); this.logger.verbose(`Chatwoot inbox name: ${data.name_inbox}`); this.logger.verbose(`Chatwoot sign msg: ${data.sign_msg}`); + this.logger.verbose(`Chatwoot reopen conversation: ${data.reopen_conversation}`); + this.logger.verbose(`Chatwoot conversation pending: ${data.conversation_pending}`); Object.assign(this.localChatwoot, data); this.logger.verbose('Chatwoot set'); @@ -342,6 +357,8 @@ export class WAStartupService { this.logger.verbose(`Chatwoot url: ${data.url}`); this.logger.verbose(`Chatwoot inbox name: ${data.name_inbox}`); this.logger.verbose(`Chatwoot sign msg: ${data.sign_msg}`); + this.logger.verbose(`Chatwoot reopen conversation: ${data.reopen_conversation}`); + this.logger.verbose(`Chatwoot conversation pending: ${data.conversation_pending}`); return data; } @@ -618,7 +635,6 @@ export class WAStartupService { color: { light: '#ffffff', dark: '#198754' }, }; - console.log(this.phoneNumber); if (this.phoneNumber) { await delay(2000); this.instance.qrcode.pairingCode = await this.client.requestPairingCode( diff --git a/src/whatsapp/types/wa.types.ts b/src/whatsapp/types/wa.types.ts index 80aede98..a0d514d8 100644 --- a/src/whatsapp/types/wa.types.ts +++ b/src/whatsapp/types/wa.types.ts @@ -56,6 +56,9 @@ export declare namespace wa { url?: string; name_inbox?: string; sign_msg?: boolean; + number?: string; + reopen_conversation?: boolean; + conversation_pending?: boolean; }; export type LocalSettings = { From 6bb1abd7f0a186dd535cb11610fc860e078cb219 Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Tue, 25 Jul 2023 15:29:42 -0300 Subject: [PATCH 6/6] fix: Option conversation_pending in chatwoot endpoint --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3922d284..f3a30ac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.4.4 (homolog) +# 1.4.4 (2023-07-25 15:24) ### Fixed