Squashed commit of the following:

commit fb6e58b3c4
Merge: 1d3d557 67e9845
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Wed Jul 26 09:39:37 2023 -0300

    Merge branch 'release/1.4.5'

commit 67e98456bb
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Wed Jul 26 09:39:27 2023 -0300

    fix: Fix mids going duplicated in chatwoot

commit 3e47420534
Merge: 3f41974 1d3d557
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Wed Jul 26 09:38:44 2023 -0300

    Merge tag '1.4.5' into develop

    * Fixed problems in localization template in chatwoot
    * Fix mids going duplicated in chatwoot

commit 1d3d557c43
Merge: 6b926dc 3f41974
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Wed Jul 26 09:38:36 2023 -0300

    Merge branch 'release/1.4.5'

commit 3f41974a75
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Wed Jul 26 09:38:22 2023 -0300

    fix: Fix mids going duplicated in chatwoot

commit 3e3c7397a5
Merge: de0c9a1 dcb5170
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Wed Jul 26 09:36:10 2023 -0300

    Merge branch 'develop' of github.com:EvolutionAPI/evolution-api into develop

commit dcb51702e7
Merge: 4769d75 dd0c1e2
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Wed Jul 26 09:36:01 2023 -0300

    Merge pull request #30 from codephix/patch-1

    Update whatsapp.service.ts

commit de0c9a1eff
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Wed Jul 26 09:34:10 2023 -0300

    fix: fixed problems in localization template

commit dd0c1e20a7
Author: CodePhix <contato@codephix.com>
Date:   Tue Jul 25 19:59:42 2023 -0300

    Update whatsapp.service.ts

commit 4769d75dc3
Merge: ecae077 6b926dc
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 16:20:04 2023 -0300

    Merge tag '1.4.4' into develop

    * 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

commit 6b926dc697
Merge: 2b6dbfd ecae077
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 16:19:54 2023 -0300

    Merge branch 'release/1.4.4'

commit ecae077c6d
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 16:16:49 2023 -0300

    fix: Option conversation_pending in chatwoot endpoint

commit 78ab1bed35
Merge: 6bb1abd 2b6dbfd
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 15:31:16 2023 -0300

    Merge tag '1.4.4' into develop

    * 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

commit 2b6dbfde6b
Merge: 82b1567 6bb1abd
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 15:31:06 2023 -0300

    Merge branch 'release/1.4.4'

commit 6bb1abd7f0
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 15:29:42 2023 -0300

    fix: Option conversation_pending in chatwoot endpoint

commit aef92240cc
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 15:20:21 2023 -0300

    fix: Option conversation_pending in chatwoot endpoint

commit f0d8c2d095
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 13:19:15 2023 -0300

    fix: Solved receive location in chatwoot

commit 14529f2c35
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 12:47:35 2023 -0300

    fix: When requesting the pairing code, it also brings the qr code

commit 89f40d54d9
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 12:41:54 2023 -0300

    fix: Solved receive location in chatwoot

commit 4c006970a2
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 11:52:26 2023 -0300

    fix: Fixed chatwoot line wrap issue

commit de676041df
Merge: 1cd7291 82b1567
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 10:51:53 2023 -0300

    Merge tag '1.4.3' into develop

    * Adjusts in settings with options always_online, read_messages and read_status
    * Fixed send webhook for event CALL
    * Create instance with settings

commit 82b1567ae5
Merge: f95f312 1cd7291
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 10:51:42 2023 -0300

    Merge branch 'release/1.4.3'

commit 1cd7291068
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 10:51:28 2023 -0300

    version: 1.4.3

commit fdee1df5b3
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 10:42:45 2023 -0300

    fix: Create instance with settings

commit c314d00ccd
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 10:42:34 2023 -0300

    fix: Create instance with settings

commit 62e2a8a6e3
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 10:23:18 2023 -0300

    fix: Fixed send webhook for event CALL

commit a12231a0aa
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Tue Jul 25 09:57:28 2023 -0300

    fix: Adjusts in settings with options always_online, read_messages and read_status

commit 183efd427a
Merge: 4d9ca4b f95f312
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:52:58 2023 -0300

    Merge tag '1.4.2' into develop

    * Fixed validation is set settings
    * Adjusts in group validations
    * Ajusts in sticker message to chatwoot

commit f95f3126c3
Merge: cc91f2e 4d9ca4b
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:52:46 2023 -0300

    Merge branch 'release/1.4.2'

commit 4d9ca4b451
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:52:34 2023 -0300

    version: 1.4.2

commit c76334a68a
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:32:29 2023 -0300

    fix: Ajusts in sticker message to chatwoot

commit f475391ba6
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:32:15 2023 -0300

    fix: Ajusts in sticker message to chatwoot

commit b77f22790b
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:13:18 2023 -0300

    fix: Fixed validation is set settings

commit 757a578c6e
Merge: c582476 f8e1892
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:12:51 2023 -0300

    Merge branch 'develop' of github.com:EvolutionAPI/evolution-api into develop

commit c5824767c8
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:11:49 2023 -0300

    fix: Fixed validation is set settings

commit 84f3f07279
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:11:15 2023 -0300

    fix: Fixed validation is set settings

commit f8e1892eee
Merge: 036a8ed 58ed6f3
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:08:24 2023 -0300

    fix: group validation

    Group validation

commit 036a8edca0
Merge: 3d8e6f4 ef4be6a
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 20:07:05 2023 -0300

    fix: Promote All Participants in Create Group

    Promote All Participants in Create Group

commit 58ed6f395f
Author: Alan Mosko <moskoweb@gmail.com>
Date:   Mon Jul 24 19:59:09 2023 -0300

    Validação de Grupo

commit ef4be6a612
Author: Alan Mosko <moskoweb@gmail.com>
Date:   Mon Jul 24 19:53:03 2023 -0300

    Start

commit 3d8e6f4394
Merge: 8b6e577 0cc1f18
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 19:08:39 2023 -0300

    fix: Fixed mentions

    Fixed mentions

commit 0cc1f18a7e
Author: Alan Mosko <moskoweb@gmail.com>
Date:   Mon Jul 24 19:05:32 2023 -0300

    [BUG] Correção de mencionar

    Caso seja enviado everyOne como false sem passar nada no mentioned

commit 8b6e577b8f
Merge: f9abd90 cc91f2e
Author: Davidson Gomes <davidsongviolao@gmail.com>
Date:   Mon Jul 24 18:28:57 2023 -0300

    Merge tag '1.4.1' into develop

    * Fixed reconnect with pairing code or qrcode
    * Fixed problem in createJid

CHANGELOG.md

@@ -1,3 +1,36 @@
+# 1.4.5 (2023-07-26 09:32)
+
+### Fixed
+
+* Fixed problems in localization template in chatwoot
+* Fix mids going duplicated in chatwoot
+
+# 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
+
+* Adjusts in settings with options always_online, read_messages and read_status
+* Fixed send webhook for event CALL
+* Create instance with settings
+
+# 1.4.2 (2023-07-24 20:52)
+
+### Fixed
+
+* Fixed validation is set settings 
+* Adjusts in group validations
+* Ajusts in sticker message to chatwoot
+
 # 1.4.1 (2023-07-24 18:28)
 
 ### Fixed

Docker/.env.example

@@ -73,6 +73,7 @@ WEBHOOK_EVENTS_GROUPS_UPSERT=true
 WEBHOOK_EVENTS_GROUPS_UPDATE=true
 WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
 WEBHOOK_EVENTS_CONNECTION_UPDATE=true
+WEBHOOK_EVENTS_CALL=true
 # This event fires every time a new token is requested via the refresh route
 WEBHOOK_EVENTS_NEW_JWT_TOKEN=false
 

Dockerfile

@@ -74,6 +74,7 @@ ENV WEBHOOK_EVENTS_GROUPS_UPSERT=true
 ENV WEBHOOK_EVENTS_GROUPS_UPDATE=true
 ENV WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
 ENV WEBHOOK_EVENTS_CONNECTION_UPDATE=true
+ENV WEBHOOK_EVENTS_CALL=true
 
 ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=false
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.4.1",
+  "version": "1.4.5",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {

src/config/env.config.ts

@@ -1,7 +1,7 @@
-import { isBooleanString } from 'class-validator';
 import { readFileSync } from 'fs';
 import { load } from 'js-yaml';
 import { join } from 'path';
+import { isBooleanString } from 'class-validator';
 
 export type HttpServer = { TYPE: 'http' | 'https'; PORT: number; URL: string };
 
@@ -14,7 +14,15 @@ export type Cors = {
 
 export type LogBaileys = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace';
 
-export type LogLevel = 'ERROR' | 'WARN' | 'DEBUG' | 'INFO' | 'LOG' | 'VERBOSE' | 'DARK' | 'WEBHOOKS';
+export type LogLevel =
+  | 'ERROR'
+  | 'WARN'
+  | 'DEBUG'
+  | 'INFO'
+  | 'LOG'
+  | 'VERBOSE'
+  | 'DARK'
+  | 'WEBHOOKS';
 
 export type Log = {
   LEVEL: LogLevel[];
@@ -81,6 +89,7 @@ export type EventsWebhook = {
   GROUPS_UPSERT: boolean;
   GROUP_UPDATE: boolean;
   GROUP_PARTICIPANTS_UPDATE: boolean;
+  CALL: boolean;
   NEW_JWT_TOKEN: boolean;
 };
 
@@ -147,7 +156,9 @@ export class ConfigService {
   }
 
   private envYaml(): Env {
-        return load(readFileSync(join(process.cwd(), 'src', 'env.yml'), { encoding: 'utf-8' })) as Env;
+    return load(
+      readFileSync(join(process.cwd(), 'src', 'env.yml'), { encoding: 'utf-8' }),
+    ) as Env;
   }
 
   private envProcess(): Env {
@@ -233,7 +244,9 @@ export class ConfigService {
           CONNECTION_UPDATE: process.env?.WEBHOOK_EVENTS_CONNECTION_UPDATE === 'true',
           GROUPS_UPSERT: process.env?.WEBHOOK_EVENTS_GROUPS_UPSERT === 'true',
           GROUP_UPDATE: process.env?.WEBHOOK_EVENTS_GROUPS_UPDATE === 'true',
-                    GROUP_PARTICIPANTS_UPDATE: process.env?.WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE === 'true',
+          GROUP_PARTICIPANTS_UPDATE:
+            process.env?.WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE === 'true',
+          CALL: process.env?.WEBHOOK_EVENTS_CALL === 'true',
           NEW_JWT_TOKEN: process.env?.WEBHOOK_EVENTS_NEW_JWT_TOKEN === 'true',
         },
       },
@@ -249,7 +262,8 @@ export class ConfigService {
         API_KEY: {
           KEY: process.env.AUTHENTICATION_API_KEY,
         },
-                EXPOSE_IN_FETCH_INSTANCES: process.env?.AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES === 'true',
+        EXPOSE_IN_FETCH_INSTANCES:
+          process.env?.AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES === 'true',
         JWT: {
           EXPIRIN_IN: Number.isInteger(process.env?.AUTHENTICATION_JWT_EXPIRIN_IN)
             ? Number.parseInt(process.env.AUTHENTICATION_JWT_EXPIRIN_IN)

src/dev-env.yml

@@ -110,6 +110,7 @@ WEBHOOK:
     GROUP_UPDATE: true
     GROUP_PARTICIPANTS_UPDATE: true
     CONNECTION_UPDATE: true
+    CALL: true
     # This event fires every time a new token is requested via the refresh route
     NEW_JWT_TOKEN: false
 

src/validate/validate.schema.ts

@@ -53,6 +53,7 @@ export const instanceNameSchema: JSONSchema7 = {
           'GROUP_UPDATE',
           'GROUP_PARTICIPANTS_UPDATE',
           'CONNECTION_UPDATE',
+          'CALL',
           'NEW_JWT_TOKEN',
         ],
       },
@@ -455,7 +456,7 @@ export const readMessageSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',
   properties: {
-        readMessages: {
+    read_messages: {
       type: 'array',
       minItems: 1,
       uniqueItems: true,
@@ -470,7 +471,7 @@ export const readMessageSchema: JSONSchema7 = {
       },
     },
   },
-    required: ['readMessages'],
+  required: ['read_messages'],
 };
 
 export const privacySettingsSchema: JSONSchema7 = {
@@ -667,6 +668,7 @@ export const createGroupSchema: JSONSchema7 = {
     subject: { type: 'string' },
     description: { type: 'string' },
     profilePicture: { type: 'string' },
+    promoteParticipants: { type: 'boolean', enum: [true, false] },
     participants: {
       type: 'array',
       minItems: 1,
@@ -853,6 +855,7 @@ export const webhookSchema: JSONSchema7 = {
           'GROUP_UPDATE',
           'GROUP_PARTICIPANTS_UPDATE',
           'CONNECTION_UPDATE',
+          'CALL',
           'NEW_JWT_TOKEN',
         ],
       },
@@ -871,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'],
+  required: [
-    ...isNotEmpty('account_id', 'token', 'url', 'sign_msg'),
+    '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 = {
@@ -883,7 +903,22 @@ export const settingsSchema: JSONSchema7 = {
     reject_call: { type: 'boolean', enum: [true, false] },
     msg_call: { type: 'string' },
     groups_ignore: { type: 'boolean', enum: [true, false] },
+    always_online: { type: 'boolean', enum: [true, false] },
+    read_messages: { type: 'boolean', enum: [true, false] },
+    read_status: { type: 'boolean', enum: [true, false] },
   },
-    required: ['reject_call'],
+  required: [
-    ...isNotEmpty('reject_call'),
+    'reject_call',
+    'groups_ignore',
+    'always_online',
+    'read_messages',
+    'read_status',
+  ],
+  ...isNotEmpty(
+    'reject_call',
+    'groups_ignore',
+    'always_online',
+    'read_messages',
+    'read_status',
+  ),
 };

src/whatsapp/controllers/chatwoot.controller.ts

@@ -1,20 +1,24 @@
 import { isURL } from 'class-validator';
-
-import { ConfigService, HttpServer } from '../../config/env.config';
-import { Logger } from '../../config/logger.config';
 import { BadRequestException } from '../../exceptions';
-import { ChatwootDto } from '../dto/chatwoot.dto';
 import { InstanceDto } from '../dto/instance.dto';
+import { ChatwootDto } from '../dto/chatwoot.dto';
 import { ChatwootService } from '../services/chatwoot.service';
+import { Logger } from '../../config/logger.config';
 import { waMonitor } from '../whatsapp.module';
+import { ConfigService, HttpServer } from '../../config/env.config';
 
 const logger = new Logger('ChatwootController');
 
 export class ChatwootController {
-    constructor(private readonly chatwootService: ChatwootService, private readonly configService: ConfigService) {}
+  constructor(
+    private readonly chatwootService: ChatwootService,
+    private readonly configService: ConfigService,
+  ) {}
 
   public async createChatwoot(instance: InstanceDto, data: ChatwootDto) {
-        logger.verbose('requested createChatwoot from ' + instance.instanceName + ' instance');
+    logger.verbose(
+      'requested createChatwoot from ' + instance.instanceName + ' instance',
+    );
 
     if (data.enabled) {
       if (!isURL(data.url, { require_tld: false })) {
@@ -40,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;
@@ -83,7 +89,9 @@ export class ChatwootController {
   }
 
   public async receiveWebhook(instance: InstanceDto, data: any) {
-        logger.verbose('requested receiveWebhook from ' + instance.instanceName + ' instance');
+    logger.verbose(
+      'requested receiveWebhook from ' + instance.instanceName + ' instance',
+    );
     const chatwootService = new ChatwootService(waMonitor, this.configService);
 
     return chatwootService.receiveWebhook(instance, data);

src/whatsapp/controllers/instance.controller.ts

@@ -1,19 +1,19 @@
 import { delay } from '@whiskeysockets/baileys';
-import { isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
-
+import { Auth, ConfigService, HttpServer } from '../../config/env.config';
-import { ConfigService, HttpServer } from '../../config/env.config';
-import { Logger } from '../../config/logger.config';
-import { RedisCache } from '../../db/redis.client';
 import { BadRequestException, InternalServerErrorException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { RepositoryBroker } from '../repository/repository.manager';
 import { AuthService, OldToken } from '../services/auth.service';
-import { ChatwootService } from '../services/chatwoot.service';
 import { WAMonitoringService } from '../services/monitor.service';
-import { WebhookService } from '../services/webhook.service';
 import { WAStartupService } from '../services/whatsapp.service';
+import { WebhookService } from '../services/webhook.service';
+import { ChatwootService } from '../services/chatwoot.service';
+import { Logger } from '../../config/logger.config';
 import { wa } from '../types/wa.types';
+import { RedisCache } from '../../db/redis.client';
+import { isURL } from 'class-validator';
+import { SettingsService } from '../services/settings.service';
 
 export class InstanceController {
   constructor(
@@ -24,6 +24,7 @@ export class InstanceController {
     private readonly authService: AuthService,
     private readonly webhookService: WebhookService,
     private readonly chatwootService: ChatwootService,
+    private readonly settingsService: SettingsService,
     private readonly cache: RedisCache,
   ) {}
 
@@ -41,18 +42,34 @@ export class InstanceController {
     chatwoot_token,
     chatwoot_url,
     chatwoot_sign_msg,
+    chatwoot_reopen_conversation,
+    chatwoot_conversation_pending,
+    reject_call,
+    msg_call,
+    groups_ignore,
+    always_online,
+    read_messages,
+    read_status,
   }: InstanceDto) {
+    try {
       this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
 
       if (instanceName !== instanceName.toLowerCase().replace(/[^a-z0-9]/g, '')) {
-            throw new BadRequestException('The instance name must be lowercase and without special characters');
+        throw new BadRequestException(
+          'The instance name must be lowercase and without special characters',
+        );
       }
 
       this.logger.verbose('checking duplicate token');
       await this.authService.checkDuplicateToken(token);
 
       this.logger.verbose('creating instance');
-        const instance = new WAStartupService(this.configService, this.eventEmitter, this.repository, this.cache);
+      const instance = new WAStartupService(
+        this.configService,
+        this.eventEmitter,
+        this.repository,
+        this.cache,
+      );
       instance.instanceName = instanceName
         .toLowerCase()
         .replace(/[^a-z0-9]/g, '')
@@ -95,6 +112,20 @@ export class InstanceController {
         }
       }
 
+      this.logger.verbose('creating settings');
+      const settings: wa.LocalSettings = {
+        reject_call: reject_call || false,
+        msg_call: msg_call || '',
+        groups_ignore: groups_ignore || false,
+        always_online: always_online || false,
+        read_messages: read_messages || false,
+        read_status: read_status || false,
+      };
+
+      this.logger.verbose('settings: ' + JSON.stringify(settings));
+
+      this.settingsService.create(instance, settings);
+
       if (!chatwoot_account_id || !chatwoot_token || !chatwoot_url) {
         let getQrcode: wa.QrCode;
 
@@ -114,6 +145,7 @@ export class InstanceController {
           webhook,
           webhook_by_events,
           events: getEvents,
+          settings,
           qrcode: getQrcode,
         };
 
@@ -139,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 {
@@ -150,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(
@@ -172,22 +224,31 @@ export class InstanceController {
         webhook,
         webhook_by_events,
         events: getEvents,
+        settings,
         chatwoot: {
           enabled: true,
           account_id: chatwoot_account_id,
           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}`,
         },
       };
+    } catch (error) {
+      console.log(error);
+      return { error: true, message: error.toString() };
+    }
   }
 
   public async connectToWhatsapp({ instanceName, number = null }: InstanceDto) {
     try {
-            this.logger.verbose('requested connectToWhatsapp from ' + instanceName + ' instance');
+      this.logger.verbose(
+        'requested connectToWhatsapp from ' + instanceName + ' instance',
+      );
 
       const instance = this.waMonitor.waInstances[instanceName];
       const state = instance?.connectionStatus?.state;
@@ -260,12 +321,16 @@ export class InstanceController {
     const { instance } = await this.connectionState({ instanceName });
 
     if (instance.state === 'close') {
-            throw new BadRequestException('The "' + instanceName + '" instance is not connected');
+      throw new BadRequestException(
+        'The "' + instanceName + '" instance is not connected',
+      );
     }
 
     try {
       this.logger.verbose('logging out instance: ' + instanceName);
-            await this.waMonitor.waInstances[instanceName]?.client?.logout('Log out instance: ' + instanceName);
+      await this.waMonitor.waInstances[instanceName]?.client?.logout(
+        'Log out instance: ' + instanceName,
+      );
 
       this.logger.verbose('close connection instance: ' + instanceName);
       this.waMonitor.waInstances[instanceName]?.client?.ws?.close();
@@ -281,7 +346,9 @@ export class InstanceController {
     const { instance } = await this.connectionState({ instanceName });
 
     if (instance.state === 'open') {
-            throw new BadRequestException('The "' + instanceName + '" instance needs to be disconnected');
+      throw new BadRequestException(
+        'The "' + instanceName + '" instance needs to be disconnected',
+      );
     }
     try {
       if (instance.state === 'connecting') {

src/whatsapp/controllers/settings.controller.ts

@@ -1,8 +1,9 @@
-import { Logger } from '../../config/logger.config';
+import { isURL } from 'class-validator';
 import { BadRequestException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { SettingsDto } from '../dto/settings.dto';
 import { SettingsService } from '../services/settings.service';
+import { Logger } from '../../config/logger.config';
 
 const logger = new Logger('SettingsController');
 
@@ -10,11 +11,9 @@ export class SettingsController {
   constructor(private readonly settingsService: SettingsService) {}
 
   public async createSettings(instance: InstanceDto, data: SettingsDto) {
-        logger.verbose('requested createSettings from ' + instance.instanceName + ' instance');
+    logger.verbose(
-
+      'requested createSettings from ' + instance.instanceName + ' instance',
-        if (data.reject_call && data.msg_call.trim() == '') {
+    );
-            throw new BadRequestException('msg_call is required');
-        }
 
     return this.settingsService.create(instance, data);
   }

src/whatsapp/dto/chat.dto.ts

@@ -1,7 +1,16 @@
-import { proto, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '@whiskeysockets/baileys';
+import {
+  WAPrivacyOnlineValue,
+  WAPrivacyValue,
+  WAReadReceiptsValue,
+  proto,
+} from '@whiskeysockets/baileys';
 
 export class OnWhatsAppDto {
-    constructor(public readonly jid: string, public readonly exists: boolean, public readonly name?: string) {}
+  constructor(
+    public readonly jid: string,
+    public readonly exists: boolean,
+    public readonly name?: string,
+  ) {}
 }
 
 export class getBase64FromMediaMessageDto {
@@ -50,7 +59,7 @@ class Key {
   remoteJid: string;
 }
 export class ReadMessageDto {
-    readMessages: Key[];
+  read_messages: Key[];
 }
 
 class LastMessage {

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/group.dto.ts

@@ -1,7 +1,8 @@
 export class CreateGroupDto {
   subject: string;
-    description?: string;
   participants: string[];
+  description?: string;
+  promoteParticipants?: boolean;
 }
 
 export class GroupPictureDto {

src/whatsapp/dto/instance.dto.ts

@@ -1,13 +1,21 @@
 export class InstanceDto {
   instanceName: string;
-    webhook?: string;
-    webhook_by_events?: boolean;
-    events?: string[];
   qrcode?: boolean;
   number?: string;
   token?: string;
+  webhook?: string;
+  webhook_by_events?: boolean;
+  events?: string[];
+  reject_call?: boolean;
+  msg_call?: string;
+  groups_ignore?: boolean;
+  always_online?: boolean;
+  read_messages?: boolean;
+  read_status?: boolean;
   chatwoot_account_id?: string;
   chatwoot_token?: string;
   chatwoot_url?: string;
   chatwoot_sign_msg?: boolean;
+  chatwoot_reopen_conversation?: boolean;
+  chatwoot_conversation_pending?: boolean;
 }

src/whatsapp/dto/settings.dto.ts

@@ -2,4 +2,7 @@ export class SettingsDto {
   reject_call?: boolean;
   msg_call?: string;
   groups_ignore?: boolean;
+  always_online?: boolean;
+  read_messages?: boolean;
+  read_status?: boolean;
 }

src/whatsapp/models/chatwoot.model.ts

@@ -1,5 +1,4 @@
 import { Schema } from 'mongoose';
-
 import { dbserver } from '../../db/db.connect';
 
 export class ChatwootRaw {
@@ -11,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>({
@@ -24,5 +25,9 @@ const chatwootSchema = new Schema<ChatwootRaw>({
   number: { type: String, required: true },
 });
 
-export const ChatwootModel = dbserver?.model(ChatwootRaw.name, chatwootSchema, 'chatwoot');
+export const ChatwootModel = dbserver?.model(
+  ChatwootRaw.name,
+  chatwootSchema,
+  'chatwoot',
+);
 export type IChatwootModel = typeof ChatwootModel;

src/whatsapp/models/settings.model.ts

@@ -1,5 +1,4 @@
 import { Schema } from 'mongoose';
-
 import { dbserver } from '../../db/db.connect';
 
 export class SettingsRaw {
@@ -7,6 +6,9 @@ export class SettingsRaw {
   reject_call?: boolean;
   msg_call?: string;
   groups_ignore?: boolean;
+  always_online?: boolean;
+  read_messages?: boolean;
+  read_status?: boolean;
 }
 
 const settingsSchema = new Schema<SettingsRaw>({
@@ -14,7 +16,14 @@ const settingsSchema = new Schema<SettingsRaw>({
   reject_call: { type: Boolean, required: true },
   msg_call: { type: String, required: true },
   groups_ignore: { type: Boolean, required: true },
+  always_online: { type: Boolean, required: true },
+  read_messages: { type: Boolean, required: true },
+  read_status: { type: Boolean, required: true },
 });
 
-export const SettingsModel = dbserver?.model(SettingsRaw.name, settingsSchema, 'settings');
+export const SettingsModel = dbserver?.model(
+  SettingsRaw.name,
+  settingsSchema,
+  'settings',
+);
 export type ISettingsModel = typeof SettingsModel;

src/whatsapp/repository/repository.manager.ts

@@ -1,17 +1,17 @@
-import fs from 'fs';
-import { MongoClient } from 'mongodb';
-import { join } from 'path';
-
-import { Auth, ConfigService, Database } from '../../config/env.config';
-import { Logger } from '../../config/logger.config';
-import { AuthRepository } from './auth.repository';
-import { ChatRepository } from './chat.repository';
-import { ChatwootRepository } from './chatwoot.repository';
-import { ContactRepository } from './contact.repository';
 import { MessageRepository } from './message.repository';
+import { ChatRepository } from './chat.repository';
+import { ContactRepository } from './contact.repository';
 import { MessageUpRepository } from './messageUp.repository';
-import { SettingsRepository } from './settings.repository';
+import { MongoClient } from 'mongodb';
 import { WebhookRepository } from './webhook.repository';
+import { ChatwootRepository } from './chatwoot.repository';
+import { SettingsRepository } from './settings.repository';
+
+import { AuthRepository } from './auth.repository';
+import { Auth, ConfigService, Database } from '../../config/env.config';
+import { join } from 'path';
+import fs from 'fs';
+import { Logger } from '../../config/logger.config';
 export class RepositoryBroker {
   constructor(
     public readonly message: MessageRepository,
@@ -43,7 +43,11 @@ export class RepositoryBroker {
 
       this.logger.verbose('creating store path: ' + storePath);
       try {
-                const authDir = join(storePath, 'auth', this.configService.get<Auth>('AUTHENTICATION').TYPE);
+        const authDir = join(
+          storePath,
+          'auth',
+          this.configService.get<Auth>('AUTHENTICATION').TYPE,
+        );
         const chatsDir = join(storePath, 'chats');
         const contactsDir = join(storePath, 'contacts');
         const messagesDir = join(storePath, 'messages');
@@ -93,17 +97,22 @@ export class RepositoryBroker {
         this.logger.error(error);
       }
     } else {
-            try {
       const storePath = join(process.cwd(), 'store');
 
       this.logger.verbose('creating store path: ' + storePath);
 
       const tempDir = join(storePath, 'temp');
+      const chatwootDir = join(storePath, 'chatwoot');
 
+      if (!fs.existsSync(chatwootDir)) {
+        this.logger.verbose('creating chatwoot dir: ' + chatwootDir);
+        fs.mkdirSync(chatwootDir, { recursive: true });
+      }
       if (!fs.existsSync(tempDir)) {
         this.logger.verbose('creating temp dir: ' + tempDir);
         fs.mkdirSync(tempDir, { recursive: true });
       }
+      try {
       } catch (error) {
         this.logger.error(error);
       }

src/whatsapp/services/chatwoot.service.ts

@@ -1,17 +1,19 @@
+import { InstanceDto } from '../dto/instance.dto';
+import path from 'path';
+import { ChatwootDto } from '../dto/chatwoot.dto';
+import { WAMonitoringService } from './monitor.service';
+import { Logger } from '../../config/logger.config';
 import ChatwootClient from '@figuro/chatwoot-sdk';
+import { createReadStream, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import axios from 'axios';
 import FormData from 'form-data';
-import { createReadStream, readFileSync, unlinkSync, writeFileSync } from 'fs';
+import { SendTextDto } from '../dto/sendMessage.dto';
 import mimeTypes from 'mime-types';
-import path from 'path';
+import { SendAudioDto } from '../dto/sendMessage.dto';
-
+import { SendMediaDto } from '../dto/sendMessage.dto';
-import { ConfigService, HttpServer } from '../../config/env.config';
-import { Logger } from '../../config/logger.config';
 import { ROOT_DIR } from '../../config/path.config';
-import { ChatwootDto } from '../dto/chatwoot.dto';
+import { ConfigService, HttpServer } from '../../config/env.config';
-import { InstanceDto } from '../dto/instance.dto';
+import { type } from 'os';
-import { SendAudioDto, SendMediaDto, SendTextDto } from '../dto/sendMessage.dto';
-import { WAMonitoringService } from './monitor.service';
 
 export class ChatwootService {
   private messageCacheFile: string;
@@ -21,7 +23,10 @@ export class ChatwootService {
 
   private provider: any;
 
-    constructor(private readonly waMonitor: WAMonitoringService, private readonly configService: ConfigService) {
+  constructor(
+    private readonly waMonitor: WAMonitoringService,
+    private readonly configService: ConfigService,
+  ) {
     this.messageCache = new Set();
   }
 
@@ -52,7 +57,9 @@ export class ChatwootService {
   private async getProvider(instance: InstanceDto) {
     this.logger.verbose('get provider to instance: ' + instance.instanceName);
     try {
-            const provider = await this.waMonitor.waInstances[instance.instanceName].findChatwoot();
+      const provider = await this.waMonitor.waInstances[
+        instance.instanceName
+      ].findChatwoot();
 
       if (!provider) {
         this.logger.warn('provider not found');
@@ -165,7 +172,9 @@ export class ChatwootService {
     });
 
     this.logger.verbose('check duplicate inbox');
-        const checkDuplicate = findInbox.payload.map((inbox) => inbox.name).includes(inboxName);
+    const checkDuplicate = findInbox.payload
+      .map((inbox) => inbox.name)
+      .includes(inboxName);
 
     let inboxId: number;
 
@@ -205,7 +214,13 @@ export class ChatwootService {
     this.logger.verbose('find contact in chatwoot and create if not exists');
     const contact =
       (await this.findContact(instance, '123456')) ||
-            ((await this.createContact(instance, '123456', inboxId, false, 'EvolutionAPI')) as any);
+      ((await this.createContact(
+        instance,
+        '123456',
+        inboxId,
+        false,
+        'EvolutionAPI',
+      )) as any);
 
     if (!contact) {
       this.logger.warn('contact not found');
@@ -216,12 +231,18 @@ export class ChatwootService {
 
     if (qrcode) {
       this.logger.verbose('create conversation in chatwoot');
-            const conversation = await client.conversations.create({
+      const data = {
-                accountId: this.provider.account_id,
-                data: {
         contact_id: contactId.toString(),
         inbox_id: inboxId.toString(),
-                },
+      };
+
+      if (this.provider.conversation_pending) {
+        data['status'] = 'pending';
+      }
+
+      const conversation = await client.conversations.create({
+        accountId: this.provider.account_id,
+        data,
       });
 
       if (!conversation) {
@@ -404,18 +425,23 @@ export class ChatwootService {
 
       if (isGroup) {
         this.logger.verbose('get group name');
-                const group = await this.waMonitor.waInstances[instance.instanceName].client.groupMetadata(chatId);
+        const group = await this.waMonitor.waInstances[
+          instance.instanceName
+        ].client.groupMetadata(chatId);
 
         nameContact = `${group.subject} (GROUP)`;
 
         this.logger.verbose('find or create participant in chatwoot');
 
-                const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(
+        const picture_url = await this.waMonitor.waInstances[
+          instance.instanceName
+        ].profilePicture(body.key.participant.split('@')[0]);
+
+        const findParticipant = await this.findContact(
+          instance,
           body.key.participant.split('@')[0],
         );
 
-                const findParticipant = await this.findContact(instance, body.key.participant.split('@')[0]);
-
         if (findParticipant) {
           if (!findParticipant.name || findParticipant.name === chatId) {
             await this.updateContact(instance, findParticipant.id, {
@@ -437,7 +463,9 @@ export class ChatwootService {
 
       this.logger.verbose('find or create contact in chatwoot');
 
-            const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(chatId);
+      const picture_url = await this.waMonitor.waInstances[
+        instance.instanceName
+      ].profilePicture(chatId);
 
       const findContact = await this.findContact(instance, chatId);
 
@@ -482,7 +510,8 @@ export class ChatwootService {
         return null;
       }
 
-            const contactId = contact?.payload?.id || contact?.payload?.contact?.id || contact?.id;
+      const contactId =
+        contact?.payload?.id || contact?.payload?.contact?.id || contact?.id;
 
       if (!body.key.fromMe && contact.name === chatId && nameContact !== chatId) {
         this.logger.verbose('update contact name in chatwoot');
@@ -498,10 +527,20 @@ export class ChatwootService {
       })) as any;
 
       if (contactConversations) {
-                this.logger.verbose('return conversation if exists');
+        let conversation: any;
-                const conversation = contactConversations.payload.find(
+        if (this.provider.reopen_conversation) {
-                    (conversation) => conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id,
+          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;
@@ -509,12 +548,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: {
+        data,
-                    contact_id: `${contactId}`,
-                    inbox_id: `${filterInbox.id}`,
-                },
       });
 
       if (!conversation) {
@@ -550,7 +595,9 @@ export class ChatwootService {
     }
 
     this.logger.verbose('find inbox by name');
-        const findByName = inbox.payload.find((inbox) => inbox.name === instance.instanceName);
+    const findByName = inbox.payload.find(
+      (inbox) => inbox.name === instance.instanceName,
+    );
 
     if (!findByName) {
       this.logger.warn('inbox not found');
@@ -652,7 +699,8 @@ export class ChatwootService {
 
     this.logger.verbose('find conversation by contact id');
     const conversation = findConversation.data.payload.find(
-            (conversation) => conversation?.meta?.sender?.id === contact.id && conversation.status === 'open',
+      (conversation) =>
+        conversation?.meta?.sender?.id === contact.id && conversation.status === 'open',
     );
 
     if (!conversation) {
@@ -772,7 +820,8 @@ export class ChatwootService {
 
     this.logger.verbose('find conversation by contact id');
     const conversation = findConversation.data.payload.find(
-            (conversation) => conversation?.meta?.sender?.id === contact.id && conversation.status === 'open',
+      (conversation) =>
+        conversation?.meta?.sender?.id === contact.id && conversation.status === 'open',
     );
 
     if (!conversation) {
@@ -822,7 +871,12 @@ export class ChatwootService {
     }
   }
 
-    public async sendAttachment(waInstance: any, number: string, media: any, caption?: string) {
+  public async sendAttachment(
+    waInstance: any,
+    number: string,
+    media: any,
+    caption?: string,
+  ) {
     this.logger.verbose('send attachment to instance: ' + waInstance.instanceName);
 
     try {
@@ -903,7 +957,9 @@ export class ChatwootService {
 
   public async receiveWebhook(instance: InstanceDto, body: any) {
     try {
-            this.logger.verbose('receive webhook to chatwoot instance: ' + instance.instanceName);
+      this.logger.verbose(
+        'receive webhook to chatwoot instance: ' + instance.instanceName,
+      );
       const client = await this.clientCw(instance);
 
       if (!client) {
@@ -952,7 +1008,11 @@ export class ChatwootService {
 
           if (!state) {
             this.logger.verbose('state not found');
-                        await this.createBotMessage(instance, `⚠️ ${body.inbox.name} instance not found.`, 'incoming');
+            await this.createBotMessage(
+              instance,
+              `⚠️ ${body.inbox.name} instance not found.`,
+              'incoming',
+            );
           }
 
           if (state) {
@@ -1010,10 +1070,19 @@ export class ChatwootService {
         }
       }
 
-            if (body.message_type === 'outgoing' && body?.conversation?.messages?.length && chatId !== '123456') {
+      if (
+        body.message_type === 'outgoing' &&
+        body?.conversation?.messages?.length &&
+        chatId !== '123456'
+      ) {
         this.logger.verbose('check if is group');
 
-                this.messageCacheFile = path.join(ROOT_DIR, 'store', 'chatwoot', `${instance.instanceName}_cache.txt`);
+        this.messageCacheFile = path.join(
+          ROOT_DIR,
+          'store',
+          'chatwoot',
+          `${instance.instanceName}_cache.txt`,
+        );
         this.logger.verbose('cache file path: ' + this.messageCacheFile);
 
         this.messageCache = this.loadMessageCache();
@@ -1034,7 +1103,9 @@ export class ChatwootService {
         if (senderName === null || senderName === undefined) {
           formatText = messageReceived;
         } else {
-                    formatText = this.provider.sign_msg ? `*${senderName}:*\n\n${messageReceived}` : messageReceived;
+          formatText = this.provider.sign_msg
+            ? `*${senderName}:*\n\n${messageReceived}`
+            : messageReceived;
         }
 
         for (const message of body.conversation.messages) {
@@ -1048,7 +1119,12 @@ export class ChatwootService {
                 formatText = null;
               }
 
-                            await this.sendAttachment(waInstance, chatId, attachment.data_url, formatText);
+              await this.sendAttachment(
+                waInstance,
+                chatId,
+                attachment.data_url,
+                formatText,
+              );
             }
           } else {
             this.logger.verbose('message is text');
@@ -1071,12 +1147,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,
@@ -1125,12 +1201,15 @@ export class ChatwootService {
       videoMessage: msg.videoMessage?.caption,
       extendedTextMessage: msg.extendedTextMessage?.text,
       messageContextInfo: msg.messageContextInfo?.stanzaId,
-            stickerMessage: msg.stickerMessage?.fileSha256.toString('base64'),
+      stickerMessage: undefined,
       documentMessage: msg.documentMessage?.caption,
-            documentWithCaptionMessage: msg.documentWithCaptionMessage?.message?.documentMessage?.caption,
+      documentWithCaptionMessage:
+        msg.documentWithCaptionMessage?.message?.documentMessage?.caption,
       audioMessage: msg.audioMessage?.caption,
       contactMessage: msg.contactMessage?.vcard,
       contactsArrayMessage: msg.contactsArrayMessage,
+      locationMessage: msg.locationMessage,
+      liveLocationMessage: msg.liveLocationMessage,
     };
 
     this.logger.verbose('type message: ' + types);
@@ -1144,8 +1223,19 @@ export class ChatwootService {
 
     const result = typeKey ? types[typeKey] : undefined;
 
-        if (typeKey === 'stickerMessage') {
+    if (typeKey === 'locationMessage' || typeKey === 'liveLocationMessage') {
-            return null;
+      const latitude = result.degreesLatitude;
+      const longitude = result.degreesLongitude;
+
+      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') {
@@ -1315,7 +1405,12 @@ export class ChatwootService {
             }
 
             this.logger.verbose('send data to chatwoot');
-                        const send = await this.sendData(getConversion, fileName, messageType, content);
+            const send = await this.sendData(
+              getConversion,
+              fileName,
+              messageType,
+              content,
+            );
 
             if (!send) {
               this.logger.warn('message not sent');
@@ -1341,7 +1436,12 @@ export class ChatwootService {
             this.logger.verbose('message is not group');
 
             this.logger.verbose('send data to chatwoot');
-                        const send = await this.sendData(getConversion, fileName, messageType, bodyMessage);
+            const send = await this.sendData(
+              getConversion,
+              fileName,
+              messageType,
+              bodyMessage,
+            );
 
             if (!send) {
               this.logger.warn('message not sent');
@@ -1382,7 +1482,12 @@ export class ChatwootService {
           }
 
           this.logger.verbose('send data to chatwoot');
-                    const send = await this.createMessage(instance, getConversion, content, messageType);
+          const send = await this.createMessage(
+            instance,
+            getConversion,
+            content,
+            messageType,
+          );
 
           if (!send) {
             this.logger.warn('message not sent');
@@ -1408,7 +1513,12 @@ export class ChatwootService {
           this.logger.verbose('message is not group');
 
           this.logger.verbose('send data to chatwoot');
-                    const send = await this.createMessage(instance, getConversion, bodyMessage, messageType);
+          const send = await this.createMessage(
+            instance,
+            getConversion,
+            bodyMessage,
+            messageType,
+          );
 
           if (!send) {
             this.logger.warn('message not sent');
@@ -1470,9 +1580,16 @@ export class ChatwootService {
           return await this.createBotMessage(instance, erroQRcode, 'incoming');
         } else {
           this.logger.verbose('qrcode success');
-                    const fileData = Buffer.from(body?.qrcode.base64.replace('data:image/png;base64,', ''), 'base64');
+          const fileData = Buffer.from(
+            body?.qrcode.base64.replace('data:image/png;base64,', ''),
+            'base64',
+          );
 
-                    const fileName = `${path.join(waInstance?.storePath, 'temp', `${`${instance}.png`}`)}`;
+          const fileName = `${path.join(
+            waInstance?.storePath,
+            'temp',
+            `${`${instance}.png`}`,
+          )}`;
 
           this.logger.verbose('temp file name: ' + fileName);
 
@@ -1480,7 +1597,12 @@ export class ChatwootService {
           writeFileSync(fileName, fileData, 'utf8');
 
           this.logger.verbose('send qrcode to chatwoot');
-                    await this.createBotQr(instance, 'QRCode successfully generated!', 'incoming', fileName);
+          await this.createBotQr(
+            instance,
+            'QRCode successfully generated!',
+            'incoming',
+            fileName,
+          );
 
           let msgQrCode = `⚡️ QRCode successfully generated!\n\nScan this QR code within the next 40 seconds.`;
 

src/whatsapp/services/whatsapp.service.ts

@@ -1,10 +1,9 @@
-import ffmpegPath from '@ffmpeg-installer/ffmpeg';
-import { Boom } from '@hapi/boom';
 import makeWASocket, {
   AnyMessageContent,
   BufferedEventData,
   BufferJSON,
   CacheStore,
+  makeCacheableSignalKeyStore,
   Chat,
   ConnectionState,
   Contact,
@@ -13,13 +12,11 @@ import makeWASocket, {
   downloadMediaMessage,
   fetchLatestBaileysVersion,
   generateWAMessageFromContent,
-    getAggregateVotesInPollMessage,
   getContentType,
   getDevice,
   GroupMetadata,
   isJidGroup,
   isJidUser,
-    makeCacheableSignalKeyStore,
   MessageUpsertType,
   MiscMessageGenerationOptions,
   ParticipantAction,
@@ -32,24 +29,8 @@ import makeWASocket, {
   WAMessage,
   WAMessageUpdate,
   WASocket,
+  getAggregateVotesInPollMessage,
 } from '@whiskeysockets/baileys';
-import axios from 'axios';
-import { exec, execSync } from 'child_process';
-import { arrayUnique, isBase64, isURL } from 'class-validator';
-import EventEmitter2 from 'eventemitter2';
-import fs, { existsSync, readFileSync } from 'fs';
-import Long from 'long';
-import NodeCache from 'node-cache';
-import { getMIMEType } from 'node-mime-types';
-import { release } from 'os';
-import { join } from 'path';
-import P from 'pino';
-import ProxyAgent from 'proxy-agent';
-import qrcode, { QRCodeToDataURLOptions } from 'qrcode';
-import qrcodeTerminal from 'qrcode-terminal';
-import sharp from 'sharp';
-import { v4 } from 'uuid';
-
 import {
   Auth,
   CleanStoreConf,
@@ -57,41 +38,31 @@ import {
   ConfigSessionPhone,
   Database,
   HttpServer,
-    Log,
   QrCode,
   Redis,
   Webhook,
 } from '../../config/env.config';
+import fs from 'fs';
 import { Logger } from '../../config/logger.config';
 import { INSTANCE_DIR, ROOT_DIR } from '../../config/path.config';
-import { dbserver } from '../../db/db.connect';
+import { existsSync, readFileSync } from 'fs';
-import { RedisCache } from '../../db/redis.client';
+import { join } from 'path';
-import { BadRequestException, InternalServerErrorException, NotFoundException } from '../../exceptions';
+import axios from 'axios';
-import { useMultiFileAuthStateDb } from '../../utils/use-multi-file-auth-state-db';
+import { v4 } from 'uuid';
-import { useMultiFileAuthStateRedisDb } from '../../utils/use-multi-file-auth-state-redis-db';
+import qrcode, { QRCodeToDataURLOptions } from 'qrcode';
-import {
+import qrcodeTerminal from 'qrcode-terminal';
-    ArchiveChatDto,
+import { Events, TypeMediaMessage, wa, MessageSubtype } from '../types/wa.types';
-    DeleteMessage,
+import { Boom } from '@hapi/boom';
-    getBase64FromMediaMessageDto,
+import EventEmitter2 from 'eventemitter2';
-    NumberBusiness,
+import { release } from 'os';
-    OnWhatsAppDto,
+import P from 'pino';
-    PrivacySettingDto,
+import { execSync, exec } from 'child_process';
-    ReadMessageDto,
+import ffmpegPath from '@ffmpeg-installer/ffmpeg';
-    WhatsAppNumberDto,
+import { RepositoryBroker } from '../repository/repository.manager';
-} from '../dto/chat.dto';
+import { MessageRaw, MessageUpdateRaw } from '../models/message.model';
-import {
+import { ContactRaw } from '../models/contact.model';
-    CreateGroupDto,
+import { ChatRaw } from '../models/chat.model';
-    GetParticipant,
+import { getMIMEType } from 'node-mime-types';
-    GroupDescriptionDto,
-    GroupInvite,
-    GroupJid,
-    GroupPictureDto,
-    GroupSendInvite,
-    GroupSubjectDto,
-    GroupToggleEphemeralDto,
-    GroupUpdateParticipantDto,
-    GroupUpdateSettingDto,
-} from '../dto/group.dto';
 import {
   ContactMessage,
   MediaMessage,
@@ -102,26 +73,58 @@ import {
   SendListDto,
   SendLocationDto,
   SendMediaDto,
-    SendPollDto,
   SendReactionDto,
-    SendStatusDto,
-    SendStickerDto,
   SendTextDto,
+  SendPollDto,
+  SendStickerDto,
+  SendStatusDto,
   StatusMessage,
 } from '../dto/sendMessage.dto';
-import { SettingsRaw } from '../models';
+import { arrayUnique, isBase64, isURL } from 'class-validator';
-import { ChatRaw } from '../models/chat.model';
+import {
-import { ChatwootRaw } from '../models/chatwoot.model';
+  ArchiveChatDto,
-import { ContactRaw } from '../models/contact.model';
+  DeleteMessage,
-import { MessageRaw, MessageUpdateRaw } from '../models/message.model';
+  NumberBusiness,
-import { WebhookRaw } from '../models/webhook.model';
+  OnWhatsAppDto,
-import { ContactQuery } from '../repository/contact.repository';
+  PrivacySettingDto,
+  ReadMessageDto,
+  WhatsAppNumberDto,
+  getBase64FromMediaMessageDto,
+} from '../dto/chat.dto';
 import { MessageQuery } from '../repository/message.repository';
+import { ContactQuery } from '../repository/contact.repository';
+import {
+  BadRequestException,
+  InternalServerErrorException,
+  NotFoundException,
+} from '../../exceptions';
+import {
+  CreateGroupDto,
+  GroupInvite,
+  GroupJid,
+  GroupPictureDto,
+  GroupUpdateParticipantDto,
+  GroupUpdateSettingDto,
+  GroupToggleEphemeralDto,
+  GroupSubjectDto,
+  GroupDescriptionDto,
+  GroupSendInvite,
+  GetParticipant,
+} from '../dto/group.dto';
 import { MessageUpQuery } from '../repository/messageUp.repository';
-import { RepositoryBroker } from '../repository/repository.manager';
+import { useMultiFileAuthStateDb } from '../../utils/use-multi-file-auth-state-db';
-import { Events, MessageSubtype, TypeMediaMessage, wa } from '../types/wa.types';
+import Long from 'long';
-import { waMonitor } from '../whatsapp.module';
+import { WebhookRaw } from '../models/webhook.model';
+import { ChatwootRaw } from '../models/chatwoot.model';
+import { SettingsRaw } from '../models';
+import { dbserver } from '../../db/db.connect';
+import NodeCache from 'node-cache';
+import { useMultiFileAuthStateRedisDb } from '../../utils/use-multi-file-auth-state-redis-db';
+import sharp from 'sharp';
+import { RedisCache } from '../../db/redis.client';
+import { Log } from '../../config/env.config';
 import { ChatwootService } from './chatwoot.service';
+import { waMonitor } from '../whatsapp.module';
 
 export class WAStartupService {
   constructor(
@@ -198,7 +201,10 @@ export class WAStartupService {
         this.logger.verbose('Database enabled, trying to get from database');
         const collection = dbserver
           .getClient()
-                    .db(this.configService.get<Database>('DATABASE').CONNECTION.DB_PREFIX_NAME + '-instances')
+          .db(
+            this.configService.get<Database>('DATABASE').CONNECTION.DB_PREFIX_NAME +
+              '-instances',
+          )
           .collection(this.instanceName);
         const data = await collection.findOne({ _id: 'creds' });
         if (data) {
@@ -236,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,
     };
@@ -310,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');
   }
 
@@ -321,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');
@@ -340,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;
   }
@@ -356,6 +375,15 @@ export class WAStartupService {
     this.localSettings.groups_ignore = data?.groups_ignore;
     this.logger.verbose(`Settings groups_ignore: ${this.localSettings.groups_ignore}`);
 
+    this.localSettings.always_online = data?.always_online;
+    this.logger.verbose(`Settings always_online: ${this.localSettings.always_online}`);
+
+    this.localSettings.read_messages = data?.read_messages;
+    this.logger.verbose(`Settings read_messages: ${this.localSettings.read_messages}`);
+
+    this.localSettings.read_status = data?.read_status;
+    this.logger.verbose(`Settings read_status: ${this.localSettings.read_status}`);
+
     this.logger.verbose('Settings loaded');
   }
 
@@ -365,8 +393,13 @@ export class WAStartupService {
     this.logger.verbose(`Settings reject_call: ${data.reject_call}`);
     this.logger.verbose(`Settings msg_call: ${data.msg_call}`);
     this.logger.verbose(`Settings groups_ignore: ${data.groups_ignore}`);
+    this.logger.verbose(`Settings always_online: ${data.always_online}`);
+    this.logger.verbose(`Settings read_messages: ${data.read_messages}`);
+    this.logger.verbose(`Settings read_status: ${data.read_status}`);
     Object.assign(this.localSettings, data);
     this.logger.verbose('Settings set');
+
+    this.client?.ws?.close();
   }
 
   public async findSettings() {
@@ -375,12 +408,15 @@ export class WAStartupService {
 
     if (!data) {
       this.logger.verbose('Settings not found');
-            throw new NotFoundException('Settings not found');
+      return null;
     }
 
     this.logger.verbose(`Settings url: ${data.reject_call}`);
     this.logger.verbose(`Settings msg_call: ${data.msg_call}`);
     this.logger.verbose(`Settings groups_ignore: ${data.groups_ignore}`);
+    this.logger.verbose(`Settings always_online: ${data.always_online}`);
+    this.logger.verbose(`Settings read_messages: ${data.read_messages}`);
+    this.logger.verbose(`Settings read_status: ${data.read_status}`);
     return data;
   }
 
@@ -388,10 +424,11 @@ export class WAStartupService {
     const webhookGlobal = this.configService.get<Webhook>('WEBHOOK');
     const webhookLocal = this.localWebhook.events;
     const serverUrl = this.configService.get<HttpServer>('SERVER').URL;
-        const we = event.replace(/[.-]/gm, '_').toUpperCase();
+    const we = event.replace(/[\.-]/gm, '_').toUpperCase();
     const transformedWe = we.replace(/_/gm, '-').toLowerCase();
 
-        const expose = this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES;
+    const expose =
+      this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES;
     const tokenStore = await this.repository.auth.find(this.instanceName);
     const instanceApikey = tokenStore?.apikey || 'Apikey not found';
 
@@ -529,7 +566,11 @@ export class WAStartupService {
     }
   }
 
-    private async connectionUpdate({ qr, connection, lastDisconnect }: Partial<ConnectionState>) {
+  private async connectionUpdate({
+    qr,
+    connection,
+    lastDisconnect,
+  }: Partial<ConnectionState>) {
     this.logger.verbose('Connection update');
     if (qr) {
       this.logger.verbose('QR code found');
@@ -594,10 +635,11 @@ 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(this.phoneNumber);
+        this.instance.qrcode.pairingCode = await this.client.requestPairingCode(
+          this.phoneNumber,
+        );
       } else {
         this.instance.qrcode.pairingCode = null;
       }
@@ -662,7 +704,8 @@ export class WAStartupService {
 
     if (connection === 'close') {
       this.logger.verbose('Connection closed');
-            const shouldReconnect = (lastDisconnect.error as Boom)?.output?.statusCode !== DisconnectReason.loggedOut;
+      const shouldReconnect =
+        (lastDisconnect.error as Boom)?.output?.statusCode !== DisconnectReason.loggedOut;
       if (shouldReconnect) {
         this.logger.verbose('Reconnecting to whatsapp');
         await this.connectToWhatsapp();
@@ -696,7 +739,9 @@ export class WAStartupService {
     if (connection === 'open') {
       this.logger.verbose('Connection opened');
       this.instance.wuid = this.client.user.id.replace(/:\d+/, '');
-            this.instance.profilePictureUrl = (await this.profilePicture(this.instance.wuid)).profilePictureUrl;
+      this.instance.profilePictureUrl = (
+        await this.profilePicture(this.instance.wuid)
+      ).profilePictureUrl;
       this.logger.info(
         `
         ┌──────────────────────────────┐
@@ -729,7 +774,8 @@ export class WAStartupService {
       }
       if (webMessageInfo[0].message?.pollCreationMessage) {
         this.logger.verbose('Returning poll message');
-                const messageSecretBase64 = webMessageInfo[0].message?.messageContextInfo?.messageSecret;
+        const messageSecretBase64 =
+          webMessageInfo[0].message?.messageContextInfo?.messageSecret;
 
         if (typeof messageSecretBase64 === 'string') {
           const messageSecret = Buffer.from(messageSecretBase64, 'base64');
@@ -778,9 +824,7 @@ export class WAStartupService {
               );
             }
           }
-                } catch (error) {
+        } catch (error) {}
-                    this.logger.error(error);
-                }
       }, (cleanStore?.CLEANING_INTERVAL ?? 3600) * 1000);
     }
   }
@@ -823,24 +867,33 @@ export class WAStartupService {
       const socketConfig: UserFacingSocketConfig = {
         auth: {
           creds: this.instance.authState.state.creds,
-                    keys: makeCacheableSignalKeyStore(this.instance.authState.state.keys, P({ level: 'error' })),
+          keys: makeCacheableSignalKeyStore(
+            this.instance.authState.state.keys,
+            P({ level: 'error' }),
+          ),
         },
         logger: P({ level: this.logBaileys }),
         printQRInTerminal: false,
         browser,
         version,
+        markOnlineOnConnect: this.localSettings.always_online,
         connectTimeoutMs: 60_000,
         qrTimeout: 40_000,
         defaultQueryTimeoutMs: undefined,
         emitOwnEvents: false,
         msgRetryCounterCache: this.msgRetryCounterCache,
-                getMessage: async (key) => (await this.getMessage(key)) as Promise<proto.IMessage>,
+        getMessage: async (key) =>
+          (await this.getMessage(key)) as Promise<proto.IMessage>,
         generateHighQualityLinkPreview: true,
         syncFullHistory: true,
         userDevicesCache: this.userDevicesCache,
         transactionOpts: { maxCommitRetries: 1, delayBetweenTriesMs: 10 },
         patchMessageBeforeSending: (message) => {
-                    const requiresPatch = !!(message.buttonsMessage || message.listMessage || message.templateMessage);
+          const requiresPatch = !!(
+            message.buttonsMessage ||
+            message.listMessage ||
+            message.templateMessage
+          );
           if (requiresPatch) {
             message = {
               viewOnceMessageV2: {
@@ -903,7 +956,11 @@ export class WAStartupService {
       await this.sendDataWebhook(Events.CHATS_UPSERT, chatsRaw);
 
       this.logger.verbose('Inserting chats in database');
-            await this.repository.chat.insert(chatsRaw, this.instance.name, database.SAVE_DATA.CHATS);
+      await this.repository.chat.insert(
+        chatsRaw,
+        this.instance.name,
+        database.SAVE_DATA.CHATS,
+      );
     },
 
     'chats.update': async (
@@ -968,7 +1025,11 @@ export class WAStartupService {
       await this.sendDataWebhook(Events.CONTACTS_UPSERT, contactsRaw);
 
       this.logger.verbose('Inserting contacts in database');
-            await this.repository.contact.insert(contactsRaw, this.instance.name, database.SAVE_DATA.CONTACTS);
+      await this.repository.contact.insert(
+        contactsRaw,
+        this.instance.name,
+        database.SAVE_DATA.CONTACTS,
+      );
     },
 
     'contacts.update': async (contacts: Partial<Contact>[], database: Database) => {
@@ -989,7 +1050,11 @@ export class WAStartupService {
       await this.sendDataWebhook(Events.CONTACTS_UPDATE, contactsRaw);
 
       this.logger.verbose('Updating contacts in database');
-            await this.repository.contact.update(contactsRaw, this.instance.name, database.SAVE_DATA.CONTACTS);
+      await this.repository.contact.update(
+        contactsRaw,
+        this.instance.name,
+        database.SAVE_DATA.CONTACTS,
+      );
     },
   };
 
@@ -1022,7 +1087,11 @@ export class WAStartupService {
         await this.sendDataWebhook(Events.CHATS_SET, chatsRaw);
 
         this.logger.verbose('Inserting chats in database');
-                await this.repository.chat.insert(chatsRaw, this.instance.name, database.SAVE_DATA.CHATS);
+        await this.repository.chat.insert(
+          chatsRaw,
+          this.instance.name,
+          database.SAVE_DATA.CHATS,
+        );
       }
 
       const messagesRaw: MessageRaw[] = [];
@@ -1033,7 +1102,11 @@ export class WAStartupService {
         if (!m.message) {
           continue;
         }
-                if (messagesRepository.find((mr) => mr.owner === this.instance.name && mr.key.id === m.key.id)) {
+        if (
+          messagesRepository.find(
+            (mr) => mr.owner === this.instance.name && mr.key.id === m.key.id,
+          )
+        ) {
           continue;
         }
 
@@ -1074,7 +1147,7 @@ export class WAStartupService {
 
       if (
         type !== 'notify' ||
-                // received.message?.protocolMessage ||
+        received.message?.protocolMessage ||
         received.message?.pollUpdateMessage
       ) {
         this.logger.verbose('message rejected');
@@ -1085,7 +1158,7 @@ export class WAStartupService {
         received.messageTimestamp = received.messageTimestamp?.toNumber();
       }
 
-            if (settings.groups_ignore && received.key.remoteJid.includes('@g.us')) {
+      if (settings?.groups_ignore && received.key.remoteJid.includes('@g.us')) {
         this.logger.verbose('group ignored');
         return;
       }
@@ -1100,6 +1173,14 @@ export class WAStartupService {
         source: getDevice(received.key.id),
       };
 
+      if (this.localSettings.read_messages && received.key.id !== 'status@broadcast') {
+        await this.client.readMessages([received.key]);
+      }
+
+      if (this.localSettings.read_status && received.key.id === 'status@broadcast') {
+        await this.client.readMessages([received.key]);
+      }
+
       this.logger.log(messageRaw);
 
       this.logger.verbose('Sending data to webhook in event MESSAGES_UPSERT');
@@ -1114,7 +1195,11 @@ export class WAStartupService {
       }
 
       this.logger.verbose('Inserting message in database');
-            await this.repository.message.insert([messageRaw], this.instance.name, database.SAVE_DATA.NEW_MESSAGE);
+      await this.repository.message.insert(
+        [messageRaw],
+        this.instance.name,
+        database.SAVE_DATA.NEW_MESSAGE,
+      );
 
       this.logger.verbose('Verifying contact from message');
       const contact = await this.repository.contact.find({
@@ -1124,7 +1209,8 @@ export class WAStartupService {
       const contactRaw: ContactRaw = {
         id: received.key.remoteJid,
         pushName: received.pushName,
-                profilePictureUrl: (await this.profilePicture(received.key.remoteJid)).profilePictureUrl,
+        profilePictureUrl: (await this.profilePicture(received.key.remoteJid))
+          .profilePictureUrl,
         owner: this.instance.name,
       };
 
@@ -1138,7 +1224,8 @@ export class WAStartupService {
         const contactRaw: ContactRaw = {
           id: received.key.remoteJid,
           pushName: contact[0].pushName,
-                    profilePictureUrl: (await this.profilePicture(received.key.remoteJid)).profilePictureUrl,
+          profilePictureUrl: (await this.profilePicture(received.key.remoteJid))
+            .profilePictureUrl,
           owner: this.instance.name,
         };
 
@@ -1154,7 +1241,11 @@ export class WAStartupService {
         }
 
         this.logger.verbose('Updating contact in database');
-                await this.repository.contact.update([contactRaw], this.instance.name, database.SAVE_DATA.CONTACTS);
+        await this.repository.contact.update(
+          [contactRaw],
+          this.instance.name,
+          database.SAVE_DATA.CONTACTS,
+        );
         return;
       }
 
@@ -1164,10 +1255,18 @@ export class WAStartupService {
       await this.sendDataWebhook(Events.CONTACTS_UPSERT, contactRaw);
 
       this.logger.verbose('Inserting contact in database');
-            await this.repository.contact.insert([contactRaw], this.instance.name, database.SAVE_DATA.CONTACTS);
+      await this.repository.contact.insert(
+        [contactRaw],
+        this.instance.name,
+        database.SAVE_DATA.CONTACTS,
+      );
     },
 
-        'messages.update': async (args: WAMessageUpdate[], database: Database, settings: SettingsRaw) => {
+    'messages.update': async (
+      args: WAMessageUpdate[],
+      database: Database,
+      settings: SettingsRaw,
+    ) => {
       this.logger.verbose('Event received: messages.update');
       const status: Record<number, wa.StatusMessage> = {
         0: 'ERROR',
@@ -1178,7 +1277,7 @@ export class WAStartupService {
         5: 'PLAYED',
       };
       for await (const { key, update } of args) {
-                if (settings.groups_ignore && key.remoteJid.includes('@g.us')) {
+        if (settings?.groups_ignore && key.remoteJid.includes('@g.us')) {
           this.logger.verbose('group ignored');
           return;
         }
@@ -1301,11 +1400,15 @@ export class WAStartupService {
               text: settings.msg_call,
             });
 
+            this.logger.verbose('Sending data to event messages.upsert');
             this.client.ev.emit('messages.upsert', {
               messages: [msg],
               type: 'notify',
             });
           }
+
+          this.logger.verbose('Sending data to webhook in event CALL');
+          this.sendDataWebhook(Events.CALL, call);
         }
 
         if (events['connection.update']) {
@@ -1452,10 +1555,10 @@ export class WAStartupService {
       .replace(/\+/g, '')
       .replace(/\(/g, '')
       .replace(/\)/g, '')
-            .split(':')[0]
+      .split(/\:/)[0]
       .split('@')[0];
 
-        if (number.length >= 18) {
+    if (number.includes('-') && number.length >= 24) {
       this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
       number = number.replace(/[^\d-]/g, '');
       return `${number}@g.us`;
@@ -1463,6 +1566,12 @@ export class WAStartupService {
 
     number = number.replace(/\D/g, '');
 
+    if (number.length >= 18) {
+      this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
+      number = number.replace(/[^\d-]/g, '');
+      return `${number}@g.us`;
+    }
+
     this.logger.verbose('Jid created is whatsapp: ' + `${number}@s.whatsapp.net`);
     return `${number}@s.whatsapp.net`;
   }
@@ -1558,7 +1667,11 @@ export class WAStartupService {
     }
   }
 
-    private async sendMessageWithTyping<T = proto.IMessage>(number: string, message: T, options?: Options) {
+  private async sendMessageWithTyping<T = proto.IMessage>(
+    number: string,
+    message: T,
+    options?: Options,
+  ) {
     this.logger.verbose('Sending message with typing');
 
     const numberWA = await this.whatsappNumber({ numbers: [number] });
@@ -1578,7 +1691,9 @@ export class WAStartupService {
         this.logger.verbose('Subscribing to presence');
 
         await this.client.sendPresenceUpdate(options?.presence ?? 'composing', sender);
-                this.logger.verbose('Sending presence update: ' + options?.presence ?? 'composing');
+        this.logger.verbose(
+          'Sending presence update: ' + options?.presence ?? 'composing',
+        );
 
         await delay(options.delay);
         this.logger.verbose('Set delay: ' + options.delay);
@@ -1594,7 +1709,9 @@ export class WAStartupService {
       if (options?.quoted) {
         const m = options?.quoted;
 
-                const msg = m?.message ? m : ((await this.getMessage(m.key, true)) as proto.IWebMessageInfo);
+        const msg = m?.message
+          ? m
+          : ((await this.getMessage(m.key, true)) as proto.IWebMessageInfo);
 
         if (!msg) {
           throw 'Message not found';
@@ -1616,17 +1733,13 @@ export class WAStartupService {
           if (options?.mentions) {
             this.logger.verbose('Mentions defined');
 
-                        if (!Array.isArray(options.mentions.mentioned) && !options.mentions.everyOne) {
+            if (options.mentions?.everyOne) {
-                            throw new BadRequestException('Mentions must be an array');
-                        }
-
-                        if (options.mentions.everyOne) {
               this.logger.verbose('Mentions everyone');
 
               this.logger.verbose('Getting group metadata');
               mentions = groupMetadata.participants.map((participant) => participant.id);
               this.logger.verbose('Getting group metadata for mentions');
-                        } else {
+            } else if (options.mentions?.mentioned?.length) {
               this.logger.verbose('Mentions manually defined');
               mentions = options.mentions.mentioned.map((mention) => {
                 const jid = this.createJid(mention);
@@ -1799,7 +1912,9 @@ export class WAStartupService {
       }
 
       this.logger.verbose('Getting contacts with push name');
-            status.statusJidList = contacts.filter((contact) => contact.pushName).map((contact) => contact.id);
+      status.statusJidList = contacts
+        .filter((contact) => contact.pushName)
+        .map((contact) => contact.id);
 
       this.logger.verbose(status.statusJidList);
     }
@@ -1916,7 +2031,9 @@ export class WAStartupService {
       this.logger.verbose('Media type: ' + mediaType);
 
       if (mediaMessage.mediatype === 'document' && !mediaMessage.fileName) {
-                this.logger.verbose('If media type is document and file name is not defined then');
+        this.logger.verbose(
+          'If media type is document and file name is not defined then',
+        );
         const regex = new RegExp(/.*\/(.+?)\./);
         const arrayMatch = regex.exec(mediaMessage.media);
         mediaMessage.fileName = arrayMatch[1];
@@ -2029,7 +2146,11 @@ export class WAStartupService {
     this.logger.verbose('Sending media message');
     const generate = await this.prepareMediaMessage(data.mediaMessage);
 
-        return await this.sendMessageWithTyping(data.number, { ...generate.message }, data?.options);
+    return await this.sendMessageWithTyping(
+      data.number,
+      { ...generate.message },
+      data?.options,
+    );
   }
 
   private async processAudio(audio: string, number: string) {
@@ -2151,7 +2272,10 @@ export class WAStartupService {
     };
 
     if (!arrayUnique(btnItems.text) || !arrayUnique(btnItems.ids)) {
-            throw new BadRequestException('Button texts cannot be repeated', 'Button IDs cannot be repeated.');
+      throw new BadRequestException(
+        'Button texts cannot be repeated',
+        'Button IDs cannot be repeated.',
+      );
     }
 
     return await this.sendMessageWithTyping(
@@ -2218,7 +2342,11 @@ export class WAStartupService {
 
     const vcard = (contact: ContactMessage) => {
       this.logger.verbose('Creating vcard');
-            let result = 'BEGIN:VCARD\n' + 'VERSION:3.0\n' + `N:${contact.fullName}\n` + `FN:${contact.fullName}\n`;
+      let result =
+        'BEGIN:VCARD\n' +
+        'VERSION:3.0\n' +
+        `N:${contact.fullName}\n` +
+        `FN:${contact.fullName}\n`;
 
       if (contact.organization) {
         this.logger.verbose('Organization defined');
@@ -2241,7 +2369,9 @@ export class WAStartupService {
       }
 
       result +=
-                `item1.TEL;waid=${contact.wuid}:${contact.phoneNumber}\n` + 'item1.X-ABLabel:Celular\n' + 'END:VCARD';
+        `item1.TEL;waid=${contact.wuid}:${contact.phoneNumber}\n` +
+        'item1.X-ABLabel:Celular\n' +
+        'END:VCARD';
 
       this.logger.verbose('Vcard created');
       return result;
@@ -2312,7 +2442,7 @@ export class WAStartupService {
     this.logger.verbose('Marking message as read');
     try {
       const keys: proto.IMessageKey[] = [];
-            data.readMessages.forEach((read) => {
+      data.read_messages.forEach((read) => {
         if (isJidGroup(read.remoteJid) || isJidUser(read.remoteJid)) {
           keys.push({
             remoteJid: read.remoteJid,
@@ -2331,7 +2461,8 @@ export class WAStartupService {
   public async archiveChat(data: ArchiveChatDto) {
     this.logger.verbose('Archiving chat');
     try {
-            data.lastMessage.messageTimestamp = data.lastMessage?.messageTimestamp ?? Date.now();
+      data.lastMessage.messageTimestamp =
+        data.lastMessage?.messageTimestamp ?? Date.now();
       await this.client.chatModify(
         {
           archive: data.archive,
@@ -2347,7 +2478,10 @@ export class WAStartupService {
     } catch (error) {
       throw new InternalServerErrorException({
         archived: false,
-                message: ['An error occurred while archiving the chat. Open a calling.', error.toString()],
+        message: [
+          'An error occurred while archiving the chat. Open a calling.',
+          error.toString(),
+        ],
       });
     }
   }
@@ -2357,7 +2491,10 @@ export class WAStartupService {
     try {
       return await this.client.sendMessage(del.remoteJid, { delete: del });
     } catch (error) {
-            throw new InternalServerErrorException('Error while deleting message for everyone', error?.toString());
+      throw new InternalServerErrorException(
+        'Error while deleting message for everyone',
+        error?.toString(),
+      );
     }
   }
 
@@ -2367,7 +2504,9 @@ export class WAStartupService {
       const m = data?.message;
       const convertToMp4 = data?.convertToMp4 ?? false;
 
-            const msg = m?.message ? m : ((await this.getMessage(m.key, true)) as proto.IWebMessageInfo);
+      const msg = m?.message
+        ? m
+        : ((await this.getMessage(m.key, true)) as proto.IWebMessageInfo);
 
       if (!msg) {
         throw 'Message not found';
@@ -2543,7 +2682,6 @@ export class WAStartupService {
       await this.client.updateGroupsAddPrivacy(settings.privacySettings.groupadd);
       this.logger.verbose('Groups add privacy updated');
 
-            // reinicia a instancia
       this.client?.ws?.close();
 
       return {
@@ -2558,7 +2696,10 @@ export class WAStartupService {
         },
       };
     } catch (error) {
-            throw new InternalServerErrorException('Error updating privacy settings', error.toString());
+      throw new InternalServerErrorException(
+        'Error updating privacy settings',
+        error.toString(),
+      );
     }
   }
 
@@ -2586,7 +2727,10 @@ export class WAStartupService {
         ...profile,
       };
     } catch (error) {
-            throw new InternalServerErrorException('Error updating profile name', error.toString());
+      throw new InternalServerErrorException(
+        'Error updating profile name',
+        error.toString(),
+      );
     }
   }
 
@@ -2597,7 +2741,10 @@ export class WAStartupService {
 
       return { update: 'success' };
     } catch (error) {
-            throw new InternalServerErrorException('Error updating profile name', error.toString());
+      throw new InternalServerErrorException(
+        'Error updating profile name',
+        error.toString(),
+      );
     }
   }
 
@@ -2608,7 +2755,10 @@ export class WAStartupService {
 
       return { update: 'success' };
     } catch (error) {
-            throw new InternalServerErrorException('Error updating profile status', error.toString());
+      throw new InternalServerErrorException(
+        'Error updating profile status',
+        error.toString(),
+      );
     }
   }
 
@@ -2637,7 +2787,10 @@ export class WAStartupService {
 
       return { update: 'success' };
     } catch (error) {
-            throw new InternalServerErrorException('Error updating profile picture', error.toString());
+      throw new InternalServerErrorException(
+        'Error updating profile picture',
+        error.toString(),
+      );
     }
   }
 
@@ -2648,7 +2801,10 @@ export class WAStartupService {
 
       return { update: 'success' };
     } catch (error) {
-            throw new InternalServerErrorException('Error removing profile picture', error.toString());
+      throw new InternalServerErrorException(
+        'Error removing profile picture',
+        error.toString(),
+      );
     }
   }
 
@@ -2665,10 +2821,19 @@ export class WAStartupService {
         await this.client.groupUpdateDescription(id, create.description);
       }
 
+      if (create?.promoteParticipants) {
+        this.logger.verbose('Prometing group participants: ' + create.description);
+        await this.updateGParticipant({
+          groupJid: id,
+          action: 'promote',
+          participants: participants,
+        });
+      }
+
       const group = await this.client.groupMetadata(id);
       this.logger.verbose('Getting group metadata');
 
-            return { groupMetadata: group };
+      return group;
     } catch (error) {
       this.logger.error(error);
       throw new InternalServerErrorException('Error creating group', error.toString());
@@ -2700,7 +2865,10 @@ export class WAStartupService {
 
       return { update: 'success' };
     } catch (error) {
-            throw new InternalServerErrorException('Error update group picture', error.toString());
+      throw new InternalServerErrorException(
+        'Error update group picture',
+        error.toString(),
+      );
     }
   }
 
@@ -2711,7 +2879,10 @@ export class WAStartupService {
 
       return { update: 'success' };
     } catch (error) {
-            throw new InternalServerErrorException('Error updating group subject', error.toString());
+      throw new InternalServerErrorException(
+        'Error updating group subject',
+        error.toString(),
+      );
     }
   }
 
@@ -2722,7 +2893,10 @@ export class WAStartupService {
 
       return { update: 'success' };
     } catch (error) {
-            throw new InternalServerErrorException('Error updating group description', error.toString());
+      throw new InternalServerErrorException(
+        'Error updating group description',
+        error.toString(),
+      );
     }
   }
 
@@ -2858,7 +3032,10 @@ export class WAStartupService {
   public async updateGSetting(update: GroupUpdateSettingDto) {
     this.logger.verbose('Updating setting for group: ' + update.groupJid);
     try {
-            const updateSetting = await this.client.groupSettingUpdate(update.groupJid, update.action);
+      const updateSetting = await this.client.groupSettingUpdate(
+        update.groupJid,
+        update.action,
+      );
       return { updateSetting: updateSetting };
     } catch (error) {
       throw new BadRequestException('Error updating setting', error.toString());
@@ -2868,7 +3045,10 @@ export class WAStartupService {
   public async toggleEphemeral(update: GroupToggleEphemeralDto) {
     this.logger.verbose('Toggling ephemeral for group: ' + update.groupJid);
     try {
-            const toggleEphemeral = await this.client.groupToggleEphemeral(update.groupJid, update.expiration);
+      const toggleEphemeral = await this.client.groupToggleEphemeral(
+        update.groupJid,
+        update.expiration,
+      );
       return { success: true };
     } catch (error) {
       throw new BadRequestException('Error updating setting', error.toString());

src/whatsapp/types/wa.types.ts

@@ -22,6 +22,7 @@ export enum Events {
   GROUPS_UPSERT = 'groups.upsert',
   GROUPS_UPDATE = 'groups.update',
   GROUP_PARTICIPANTS_UPDATE = 'group-participants.update',
+  CALL = 'call',
 }
 
 export declare namespace wa {
@@ -55,12 +56,18 @@ export declare namespace wa {
     url?: string;
     name_inbox?: string;
     sign_msg?: boolean;
+    number?: string;
+    reopen_conversation?: boolean;
+    conversation_pending?: boolean;
   };
 
   export type LocalSettings = {
     reject_call?: boolean;
     msg_call?: string;
     groups_ignore?: boolean;
+    always_online?: boolean;
+    read_messages?: boolean;
+    read_status?: boolean;
   };
 
   export type StateConnection = {
@@ -69,10 +76,23 @@ export declare namespace wa {
     statusReason?: number;
   };
 
-    export type StatusMessage = 'ERROR' | 'PENDING' | 'SERVER_ACK' | 'DELIVERY_ACK' | 'READ' | 'DELETED' | 'PLAYED';
+  export type StatusMessage =
+    | 'ERROR'
+    | 'PENDING'
+    | 'SERVER_ACK'
+    | 'DELIVERY_ACK'
+    | 'READ'
+    | 'DELETED'
+    | 'PLAYED';
 }
 
-export const TypeMediaMessage = ['imageMessage', 'documentMessage', 'audioMessage', 'videoMessage', 'stickerMessage'];
+export const TypeMediaMessage = [
+  'imageMessage',
+  'documentMessage',
+  'audioMessage',
+  'videoMessage',
+  'stickerMessage',
+];
 
 export const MessageSubtype = [
   'ephemeralMessage',

src/whatsapp/whatsapp.module.ts

@@ -1,44 +1,43 @@
-import { delay } from '@whiskeysockets/baileys';
-
 import { Auth, configService } from '../config/env.config';
-import { eventEmitter } from '../config/event.config';
 import { Logger } from '../config/logger.config';
-import { dbserver } from '../db/db.connect';
+import { eventEmitter } from '../config/event.config';
-import { RedisCache } from '../db/redis.client';
+import { MessageRepository } from './repository/message.repository';
+import { WAMonitoringService } from './services/monitor.service';
+import { ChatRepository } from './repository/chat.repository';
+import { ContactRepository } from './repository/contact.repository';
+import { MessageUpRepository } from './repository/messageUp.repository';
 import { ChatController } from './controllers/chat.controller';
-import { ChatwootController } from './controllers/chatwoot.controller';
-import { GroupController } from './controllers/group.controller';
 import { InstanceController } from './controllers/instance.controller';
 import { SendMessageController } from './controllers/sendMessage.controller';
-import { SettingsController } from './controllers/settings.controller';
+import { AuthService } from './services/auth.service';
+import { GroupController } from './controllers/group.controller';
 import { ViewsController } from './controllers/views.controller';
+import { WebhookService } from './services/webhook.service';
 import { WebhookController } from './controllers/webhook.controller';
+import { ChatwootService } from './services/chatwoot.service';
+import { ChatwootController } from './controllers/chatwoot.controller';
+import { RepositoryBroker } from './repository/repository.manager';
 import {
   AuthModel,
   ChatModel,
-    ChatwootModel,
   ContactModel,
   MessageModel,
   MessageUpModel,
-    SettingsModel,
+  ChatwootModel,
   WebhookModel,
+  SettingsModel,
 } from './models';
-import { AuthRepository } from './repository/auth.repository';
+import { dbserver } from '../db/db.connect';
-import { ChatRepository } from './repository/chat.repository';
-import { ChatwootRepository } from './repository/chatwoot.repository';
-import { ContactRepository } from './repository/contact.repository';
-import { MessageRepository } from './repository/message.repository';
-import { MessageUpRepository } from './repository/messageUp.repository';
-import { RepositoryBroker } from './repository/repository.manager';
-import { SettingsRepository } from './repository/settings.repository';
 import { WebhookRepository } from './repository/webhook.repository';
-import { AuthService } from './services/auth.service';
+import { ChatwootRepository } from './repository/chatwoot.repository';
-import { ChatwootService } from './services/chatwoot.service';
+import { AuthRepository } from './repository/auth.repository';
-import { WAMonitoringService } from './services/monitor.service';
-import { SettingsService } from './services/settings.service';
-import { WebhookService } from './services/webhook.service';
 import { WAStartupService } from './services/whatsapp.service';
+import { delay } from '@whiskeysockets/baileys';
 import { Events } from './types/wa.types';
+import { RedisCache } from '../db/redis.client';
+import { SettingsRepository } from './repository/settings.repository';
+import { SettingsService } from './services/settings.service';
+import { SettingsController } from './controllers/settings.controller';
 
 const logger = new Logger('WA MODULE');
 
@@ -66,7 +65,12 @@ export const repository = new RepositoryBroker(
 
 export const cache = new RedisCache();
 
-export const waMonitor = new WAMonitoringService(eventEmitter, configService, repository, cache);
+export const waMonitor = new WAMonitoringService(
+  eventEmitter,
+  configService,
+  repository,
+  cache,
+);
 
 const authService = new AuthService(configService, waMonitor, repository);
 
@@ -90,6 +94,7 @@ export const instanceController = new InstanceController(
   authService,
   webhookService,
   chatwootService,
+  settingsService,
   cache,
 );
 export const viewsController = new ViewsController(waMonitor, configService);