Merge branch 'release/1.4.4'

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.4.4 (2023-07-25 15:24)
+
+### Fixed
+
+* 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)
 
 ### Fixed

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": {

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 = {

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;

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<HttpServer>('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}`,

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;
 }

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;
 }

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<ChatwootRaw>({

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;
@@ -230,12 +231,19 @@ export class ChatwootService {
 
     if (qrcode) {
       this.logger.verbose('create conversation in chatwoot');
-      const conversation = await client.conversations.create({
-        accountId: this.provider.account_id,
-        data: {
+      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,
       });
 
       if (!conversation) {
@@ -520,11 +528,20 @@ export class ChatwootService {
       })) as any;
 
       if (contactConversations) {
-        this.logger.verbose('return conversation if exists');
-        const conversation = contactConversations.payload.find(
-          (conversation) =>
-            conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id,
+        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');
+
         if (conversation) {
           this.logger.verbose('conversation found');
           return conversation.id;
@@ -532,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) {
@@ -1125,12 +1148,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,
@@ -1186,6 +1209,11 @@ export class ChatwootService {
       audioMessage: msg.audioMessage?.caption,
       contactMessage: msg.contactMessage?.vcard,
       contactsArrayMessage: msg.contactsArrayMessage,
+      locationMessage: !msg.protocolMessage
+        ? msg.locationMessage?.degreesLatitude +
+          ',' +
+          msg.locationMessage?.degreesLongitude
+        : undefined,
     };
 
     this.logger.verbose('type message: ' + types);
@@ -1199,6 +1227,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 = {};

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,
     };
@@ -316,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');
   }
 
@@ -327,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');
@@ -346,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;
   }
@@ -622,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(

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 = {