Merge branch 'release/1.8.0'

fix: security fix in fetch instance with client key when not connected to mongodb
2025-12-19 11:52:20 -06:00 · 2024-05-27 16:36:03 -03:00 · 2024-05-27 16:35:59 -03:00 · 2024-05-27 16:35:55 -03:00 · 2024-05-27 16:24:29 -03:00 · 2024-05-27 16:24:25 -03:00
41 changed files with 889 additions and 500 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.github/workflows/publish_docker_image.yml
+++ b/.github/workflows/publish_docker_image.yml
@@ -2,63 +2,47 @@ name: Build Docker image

 on:
  push:
-    tags: ['v*']
+    tags:
+      - "*.*.*"

 jobs:
-  build-amd:
+  build_deploy:
+    name: Build and Deploy
    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4

-      - name: Extract existing image metadata
-        id: image-meta
-        uses: docker/metadata-action@v4
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
        with:
          images: atendai/evolution-api
+          tags: type=semver,pattern=v{{version}}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

-      - name: Build and push AMD image
-        uses: docker/build-push-action@v4
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
        with:
-          context: .
-          labels: ${{ steps.image-meta.outputs.labels }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

-  build-arm:
-    runs-on: buildjet-4vcpu-ubuntu-2204-arm
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Extract existing image metadata
-        id: image-meta
-        uses: docker/metadata-action@v4
-        with:
-          images: atendai/evolution-api
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push ARM image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          labels: ${{ steps.image-meta.outputs.labels }}
-          platforms: linux/arm64
-          push: true
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/publish_docker_image_homolog.yml
+++ b/.github/workflows/publish_docker_image_homolog.yml
@@ -0,0 +1,48 @@
+name: Build Docker image
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  build_deploy:
+    name: Build and Deploy
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: atendai/evolution-api
+          tags: homolog
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,36 @@
+# 1.8.0 (2024-05-27 16:10)
+
+### Feature
+
+* Now in the manager, when logging in with the client's apikey, the listing only shows the instance corresponding to the provided apikey (only with MongoDB)
+* New global mode for rabbitmq events
+* Build in docker for linux/amd64, linux/arm64 platforms
+
+### Fixed
+* Correction in message formatting when generated by AI as markdown in typebot
+* Security fix in fetch instance with client key when not connected to mongodb
+
+# 1.7.5 (2024-05-21 08:50)
+
+### Fixed
+* Add merge_brazil_contacts function to solve nine digit in brazilian numbers
+* Optimize ChatwootService method for updating contact
+* Fix swagger auth
+* Update aws sdk v3
+* Fix getOpenConversationByContact and init queries error
+* Method to mark chat as unread
+* Added environment variable to manually select the WhatsApp web version for the baileys lib (optional)
+
+# 1.7.4 (2024-04-28 09:46)
+
+### Fixed
+* Adjusts in proxy on fetchAgent
+* Recovering messages lost with redis cache
+* Log when init redis cache service
+* Recovering messages lost with redis cache
+* Chatwoot inbox name
+* Update Baileys version
+
 # 1.7.3 (2024-04-18 12:07)

 ### Fixed
--- a/Docker/.env.example
+++ b/Docker/.env.example
@@ -47,9 +47,33 @@ DATABASE_SAVE_DATA_CONTACTS=false
 DATABASE_SAVE_DATA_CHATS=false

 RABBITMQ_ENABLED=false
-RABBITMQ_RABBITMQ_MODE=global
-RABBITMQ_EXCHANGE_NAME=evolution_exchange
 RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
+RABBITMQ_EXCHANGE_NAME=evolution_exchange
+RABBITMQ_GLOBAL_ENABLED=false
+RABBITMQ_EVENTS_APPLICATION_STARTUP=false
+RABBITMQ_EVENTS_QRCODE_UPDATED=true
+RABBITMQ_EVENTS_MESSAGES_SET=true
+RABBITMQ_EVENTS_MESSAGES_UPSERT=true
+RABBITMQ_EVENTS_MESSAGES_UPDATE=true
+RABBITMQ_EVENTS_MESSAGES_DELETE=true
+RABBITMQ_EVENTS_SEND_MESSAGE=true
+RABBITMQ_EVENTS_CONTACTS_SET=true
+RABBITMQ_EVENTS_CONTACTS_UPSERT=true
+RABBITMQ_EVENTS_CONTACTS_UPDATE=true
+RABBITMQ_EVENTS_PRESENCE_UPDATE=true
+RABBITMQ_EVENTS_CHATS_SET=true
+RABBITMQ_EVENTS_CHATS_UPSERT=true
+RABBITMQ_EVENTS_CHATS_UPDATE=true
+RABBITMQ_EVENTS_CHATS_DELETE=true
+RABBITMQ_EVENTS_GROUPS_UPSERT=true
+RABBITMQ_EVENTS_GROUPS_UPDATE=true
+RABBITMQ_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
+RABBITMQ_EVENTS_CONNECTION_UPDATE=true
+RABBITMQ_EVENTS_LABELS_EDIT=true
+RABBITMQ_EVENTS_LABELS_ASSOCIATION=true
+RABBITMQ_EVENTS_CALL=true
+RABBITMQ_EVENTS_TYPEBOT_START=false
+RABBITMQ_EVENTS_TYPEBOT_CHANGE_STATUS=false

 WEBSOCKET_ENABLED=false
 WEBSOCKET_GLOBAL_EVENTS=false
@@ -125,7 +149,7 @@ CHATWOOT_MESSAGE_DELETE=false # false | true
 # If you leave this option as true, when sending a message in Chatwoot, the client's last message will be marked as read on WhatsApp.
 CHATWOOT_MESSAGE_READ=false # false | true
 # This db connection is used to import messages from whatsapp to chatwoot database
-CHATWOOT_IMPORT_DATABASE_CONNECTION_URI=postgres://user:password@hostname:port/dbname
+CHATWOOT_IMPORT_DATABASE_CONNECTION_URI=postgres://user:password@hostname:port/dbname?sslmode=disable
 CHATWOOT_IMPORT_DATABASE_PLACEHOLDER_MEDIA_MESSAGE=true

 CACHE_REDIS_ENABLED=false
--- a/32
+++ b/32
@@ -1,6 +1,6 @@
 FROM node:20.7.0-alpine AS builder

-LABEL version="1.7.3" description="Api to control whatsapp features through http requests." 
+LABEL version="1.8.0" description="Api to control whatsapp features through http requests." 
 LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
 LABEL contact="contato@agenciadgcode.com"

@@ -59,9 +59,35 @@ ENV DATABASE_SAVE_DATA_CONTACTS=false
 ENV DATABASE_SAVE_DATA_CHATS=false

 ENV RABBITMQ_ENABLED=false
-ENV RABBITMQ_MODE=global
-ENV RABBITMQ_EXCHANGE_NAME=evolution_exchange
 ENV RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
+ENV RABBITMQ_EXCHANGE_NAME=evolution_exchange
+ENV RABBITMQ_GLOBAL_ENABLED=false
+ENV RABBITMQ_EVENTS_APPLICATION_STARTUP=false
+ENV RABBITMQ_EVENTS_INSTANCE_CREATE=false
+ENV RABBITMQ_EVENTS_INSTANCE_DELETE=false
+ENV RABBITMQ_EVENTS_QRCODE_UPDATED=true
+ENV RABBITMQ_EVENTS_MESSAGES_SET=true
+ENV RABBITMQ_EVENTS_MESSAGES_UPSERT=true
+ENV RABBITMQ_EVENTS_MESSAGES_UPDATE=true
+ENV RABBITMQ_EVENTS_MESSAGES_DELETE=true
+ENV RABBITMQ_EVENTS_SEND_MESSAGE=true
+ENV RABBITMQ_EVENTS_CONTACTS_SET=true
+ENV RABBITMQ_EVENTS_CONTACTS_UPSERT=true
+ENV RABBITMQ_EVENTS_CONTACTS_UPDATE=true
+ENV RABBITMQ_EVENTS_PRESENCE_UPDATE=true
+ENV RABBITMQ_EVENTS_CHATS_SET=true
+ENV RABBITMQ_EVENTS_CHATS_UPSERT=true
+ENV RABBITMQ_EVENTS_CHATS_UPDATE=true
+ENV RABBITMQ_EVENTS_CHATS_DELETE=true
+ENV RABBITMQ_EVENTS_GROUPS_UPSERT=true
+ENV RABBITMQ_EVENTS_GROUPS_UPDATE=true
+ENV RABBITMQ_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
+ENV RABBITMQ_EVENTS_CONNECTION_UPDATE=true
+ENV RABBITMQ_EVENTS_LABELS_EDIT=true
+ENV RABBITMQ_EVENTS_LABELS_ASSOCIATION=true
+ENV RABBITMQ_EVENTS_CALL=true
+ENV RABBITMQ_EVENTS_TYPEBOT_START=false
+ENV RABBITMQ_EVENTS_TYPEBOT_CHANGE_STATUS=false

 ENV WEBSOCKET_ENABLED=false
 ENV WEBSOCKET_GLOBAL_EVENTS=false
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "evolution-api",
-  "version": "1.7.3",
+  "version": "1.8.0",
  "description": "Rest api for communication with WhatsApp",
  "main": "./dist/src/main.js",
  "scripts": {
@@ -46,10 +46,10 @@
    "@figuro/chatwoot-sdk": "^1.1.16",
    "@hapi/boom": "^10.0.1",
    "@sentry/node": "^7.59.2",
-    "@whiskeysockets/baileys": "github:AtendAI/Baileys",
    "amqplib": "^0.10.3",
-    "aws-sdk": "^2.1499.0",
+    "@aws-sdk/client-sqs": "^3.569.0",
    "axios": "^1.6.5",
+    "@whiskeysockets/baileys": "^6.7.2",
    "class-validator": "^0.14.1",
    "compression": "^1.7.4",
    "cors": "^2.8.5",
--- a/src/api/controllers/chat.controller.ts
+++ b/src/api/controllers/chat.controller.ts
@@ -4,6 +4,7 @@ import {
  BlockUserDto,
  DeleteMessage,
  getBase64FromMediaMessageDto,
+  MarkChatUnreadDto,
  NumberDto,
  PrivacySettingDto,
  ProfileNameDto,
@@ -40,6 +41,11 @@ export class ChatController {
    return await this.waMonitor.waInstances[instanceName].archiveChat(data);
  }

+  public async markChatUnread({ instanceName }: InstanceDto, data: MarkChatUnreadDto) {
+    logger.verbose('requested markChatUnread from ' + instanceName + ' instance');
+    return await this.waMonitor.waInstances[instanceName].markChatUnread(data);
+  }
+
  public async deleteMessage({ instanceName }: InstanceDto, data: DeleteMessage) {
    logger.verbose('requested deleteMessage from ' + instanceName + ' instance');
    return await this.waMonitor.waInstances[instanceName].deleteMessage(data);
--- a/src/api/controllers/instance.controller.ts
+++ b/src/api/controllers/instance.controller.ts
@@ -3,9 +3,9 @@ import { isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
 import { v4 } from 'uuid';

-import { ConfigService, HttpServer, WaBusiness } from '../../config/env.config';
+import { Auth, ConfigService, HttpServer, WaBusiness } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
-import { BadRequestException, InternalServerErrorException } from '../../exceptions';
+import { BadRequestException, InternalServerErrorException, UnauthorizedException } from '../../exceptions';
 import { InstanceDto, SetPresenceDto } from '../dto/instance.dto';
 import { ChatwootService } from '../integrations/chatwoot/services/chatwoot.service';
 import { RabbitmqService } from '../integrations/rabbitmq/services/rabbitmq.service';
@@ -15,12 +15,12 @@ import { WebsocketService } from '../integrations/websocket/services/websocket.s
 import { RepositoryBroker } from '../repository/repository.manager';
 import { AuthService, OldToken } from '../services/auth.service';
 import { CacheService } from '../services/cache.service';
+import { BaileysStartupService } from '../services/channels/whatsapp.baileys.service';
+import { BusinessStartupService } from '../services/channels/whatsapp.business.service';
 import { IntegrationService } from '../services/integration.service';
 import { WAMonitoringService } from '../services/monitor.service';
 import { SettingsService } from '../services/settings.service';
 import { WebhookService } from '../services/webhook.service';
-import { BaileysStartupService } from '../services/whatsapp/whatsapp.baileys.service';
-import { BusinessStartupService } from '../services/whatsapp/whatsapp.business.service';
 import { Events, Integration, wa } from '../types/wa.types';
 import { ProxyController } from './proxy.controller';

@@ -65,6 +65,8 @@ export class InstanceController {
    chatwoot_reopen_conversation,
    chatwoot_conversation_pending,
    chatwoot_import_contacts,
+    chatwoot_name_inbox,
+    chatwoot_merge_brazil_contacts,
    chatwoot_import_messages,
    chatwoot_days_limit_import_messages,
    reject_call,
@@ -513,11 +515,12 @@ export class InstanceController {
          token: chatwoot_token,
          url: chatwoot_url,
          sign_msg: chatwoot_sign_msg || false,
-          name_inbox: instance.instanceName.split('-cwId-')[0],
+          name_inbox: chatwoot_name_inbox ?? instance.instanceName.split('-cwId-')[0],
          number,
          reopen_conversation: chatwoot_reopen_conversation || false,
          conversation_pending: chatwoot_conversation_pending || false,
          import_contacts: chatwoot_import_contacts ?? true,
+          merge_brazil_contacts: chatwoot_merge_brazil_contacts ?? false,
          import_messages: chatwoot_import_messages ?? true,
          days_limit_import_messages: chatwoot_days_limit_import_messages ?? 60,
          auto_create: true,
@@ -573,11 +576,12 @@ export class InstanceController {
          sign_msg: chatwoot_sign_msg || false,
          reopen_conversation: chatwoot_reopen_conversation || false,
          conversation_pending: chatwoot_conversation_pending || false,
+          merge_brazil_contacts: chatwoot_merge_brazil_contacts ?? false,
          import_contacts: chatwoot_import_contacts ?? true,
          import_messages: chatwoot_import_messages ?? true,
          days_limit_import_messages: chatwoot_days_limit_import_messages || 60,
          number,
-          name_inbox: instance.instanceName,
+          name_inbox: chatwoot_name_inbox ?? instance.instanceName,
          webhook_url: `${urlServer}/chatwoot/webhook/${encodeURIComponent(instance.instanceName)}`,
        },
      };
@@ -675,11 +679,26 @@ export class InstanceController {
    };
  }

-  public async fetchInstances({ instanceName, instanceId, number }: InstanceDto) {
-    if (instanceName) {
-      this.logger.verbose('requested fetchInstances from ' + instanceName + ' instance');
-      this.logger.verbose('instanceName: ' + instanceName);
-      return this.waMonitor.instanceInfo(instanceName);
+  public async fetchInstances({ instanceName, instanceId, number }: InstanceDto, key: string) {
+    const env = this.configService.get<Auth>('AUTHENTICATION').API_KEY;
+
+    let name = instanceName;
+    let arrayReturn = false;
+
+    if (env.KEY !== key) {
+      const instanceByKey = await this.repository.auth.findByKey(key);
+      if (instanceByKey) {
+        name = instanceByKey._id;
+        arrayReturn = true;
+      } else {
+        throw new UnauthorizedException();
+      }
+    }
+
+    if (name) {
+      this.logger.verbose('requested fetchInstances from ' + name + ' instance');
+      this.logger.verbose('instanceName: ' + name);
+      return this.waMonitor.instanceInfo(name, arrayReturn);
    } else if (instanceId || number) {
      return this.waMonitor.instanceInfoById(instanceId, number);
    }
--- a/src/api/dto/chat.dto.ts
+++ b/src/api/dto/chat.dto.ts
@@ -73,6 +73,11 @@ export class ArchiveChatDto {
  archive: boolean;
 }

+export class MarkChatUnreadDto {
+  lastMessage?: LastMessage;
+  chat?: string;
+}
+
 class PrivacySetting {
  readreceipts: WAReadReceiptsValue;
  profile: WAPrivacyValue;
--- a/src/api/dto/instance.dto.ts
+++ b/src/api/dto/instance.dto.ts
@@ -27,9 +27,11 @@ export class InstanceDto {
  chatwoot_sign_msg?: boolean;
  chatwoot_reopen_conversation?: boolean;
  chatwoot_conversation_pending?: boolean;
+  chatwoot_merge_brazil_contacts?: boolean;
  chatwoot_import_contacts?: boolean;
  chatwoot_import_messages?: boolean;
  chatwoot_days_limit_import_messages?: number;
+  chatwoot_name_inbox?: string;
  websocket_enabled?: boolean;
  websocket_events?: string[];
  rabbitmq_enabled?: boolean;
--- a/src/api/guards/auth.guard.ts
+++ b/src/api/guards/auth.guard.ts
@@ -3,7 +3,7 @@ import { NextFunction, Request, Response } from 'express';
 import jwt from 'jsonwebtoken';

 import { name } from '../../../package.json';
-import { Auth, configService } from '../../config/env.config';
+import { Auth, configService, Database } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
 import { ForbiddenException, UnauthorizedException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
@@ -58,6 +58,11 @@ async function jwtGuard(req: Request, res: Response, next: NextFunction) {
 async function apikey(req: Request, _: Response, next: NextFunction) {
  const env = configService.get<Auth>('AUTHENTICATION').API_KEY;
  const key = req.get('apikey');
+  const db = configService.get<Database>('DATABASE');
+
+  if (!key) {
+    throw new UnauthorizedException();
+  }

  if (env.KEY === key) {
    return next();
@@ -66,12 +71,21 @@ async function apikey(req: Request, _: Response, next: NextFunction) {
  if ((req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances')) && !key) {
    throw new ForbiddenException('Missing global api key', 'The global api key must be set');
  }
+  const param = req.params as unknown as InstanceDto;

  try {
-    const param = req.params as unknown as InstanceDto;
-    const instanceKey = await repository.auth.find(param.instanceName);
-    if (instanceKey.apikey === key) {
-      return next();
+    if (param?.instanceName) {
+      const instanceKey = await repository.auth.find(param.instanceName);
+      if (instanceKey?.apikey === key) {
+        return next();
+      }
+    } else {
+      if (req.originalUrl.includes('/instance/fetchInstances') && db.ENABLED) {
+        const instanceByKey = await repository.auth.findByKey(key);
+        if (instanceByKey) {
+          return next();
+        }
+      }
    }
  } catch (error) {
    logger.error(error);
--- a/src/api/integrations/chatwoot/controllers/chatwoot.controller.ts
+++ b/src/api/integrations/chatwoot/controllers/chatwoot.controller.ts
@@ -53,11 +53,15 @@ export class ChatwootController {
      data.conversation_pending = false;
      data.import_contacts = false;
      data.import_messages = false;
+      data.merge_brazil_contacts = false;
      data.days_limit_import_messages = 0;
      data.auto_create = false;
+      data.name_inbox = '';
    }

-    data.name_inbox = instance.instanceName;
+    if (!data.name_inbox || data.name_inbox === '') {
+      data.name_inbox = instance.instanceName;
+    }

    const result = await this.chatwootService.create(instance, data);

--- a/src/api/integrations/chatwoot/dto/chatwoot.dto.ts
+++ b/src/api/integrations/chatwoot/dto/chatwoot.dto.ts
@@ -9,6 +9,7 @@ export class ChatwootDto {
  number?: string;
  reopen_conversation?: boolean;
  conversation_pending?: boolean;
+  merge_brazil_contacts?: boolean;
  import_contacts?: boolean;
  import_messages?: boolean;
  days_limit_import_messages?: number;
--- a/src/api/integrations/chatwoot/models/chatwoot.model.ts
+++ b/src/api/integrations/chatwoot/models/chatwoot.model.ts
@@ -14,6 +14,7 @@ export class ChatwootRaw {
  number?: string;
  reopen_conversation?: boolean;
  conversation_pending?: boolean;
+  merge_brazil_contacts?: boolean;
  import_contacts?: boolean;
  import_messages?: boolean;
  days_limit_import_messages?: number;
@@ -31,6 +32,7 @@ const chatwootSchema = new Schema<ChatwootRaw>({
  number: { type: String, required: true },
  reopen_conversation: { type: Boolean, required: true },
  conversation_pending: { type: Boolean, required: true },
+  merge_brazil_contacts: { type: Boolean, required: true },
  import_contacts: { type: Boolean, required: true },
  import_messages: { type: Boolean, required: true },
  days_limit_import_messages: { type: Number, required: true },
--- a/src/api/integrations/chatwoot/services/chatwoot.service.ts
+++ b/src/api/integrations/chatwoot/services/chatwoot.service.ts
@@ -8,6 +8,7 @@ import ChatwootClient, {
  inbox,
 } from '@figuro/chatwoot-sdk';
 import { request as chatwootRequest } from '@figuro/chatwoot-sdk/dist/core/request';
+import { proto } from '@whiskeysockets/baileys';
 import axios from 'axios';
 import FormData from 'form-data';
 import { createReadStream, unlinkSync, writeFileSync } from 'fs';
@@ -85,12 +86,14 @@ export class ChatwootService {
    return client;
  }

-  public getClientCwConfig(): ChatwootAPIConfig {
+  public getClientCwConfig(): ChatwootAPIConfig & { name_inbox: string; merge_brazil_contacts: boolean } {
    return {
      basePath: this.provider.url,
      with_credentials: true,
      credentials: 'include',
      token: this.provider.token,
+      name_inbox: this.provider.name_inbox,
+      merge_brazil_contacts: this.provider.merge_brazil_contacts,
    };
  }

@@ -110,7 +113,7 @@ export class ChatwootService {

      await this.initInstanceChatwoot(
        instance,
-        instance.instanceName.split('-cwId-')[0],
+        data.name_inbox ?? instance.instanceName.split('-cwId-')[0],
        `${urlServer}/chatwoot/webhook/${encodeURIComponent(instance.instanceName)}`,
        true,
        data.number,
@@ -416,10 +419,49 @@ export class ChatwootService {
    }
  }

+  private async mergeBrazilianContacts(contacts: any[]) {
+    try {
+      //sdk chatwoot não tem função merge
+      this.logger.verbose('merging contacts');
+      const contact = await chatwootRequest(this.getClientCwConfig(), {
+        method: 'POST',
+        url: `/api/v1/accounts/${this.provider.account_id}/actions/contact_merge`,
+        body: {
+          base_contact_id: contacts.find((contact) => contact.phone_number.length === 14)?.id,
+          mergee_contact_id: contacts.find((contact) => contact.phone_number.length === 13)?.id,
+        },
+      });
+
+      return contact;
+    } catch {
+      this.logger.error('Error merging contacts');
+      return null;
+    }
+  }
+
  private findContactInContactList(contacts: any[], query: string) {
    const phoneNumbers = this.getNumbers(query);
    const searchableFields = this.getSearchableFields();

+    // eslint-disable-next-line prettier/prettier
+    if(contacts.length === 2 && this.getClientCwConfig().merge_brazil_contacts && query.startsWith('+55')){
+
+      const contact = this.mergeBrazilianContacts(contacts);
+      if (contact) {
+        return contact;
+      }
+    }
+
+    const phone = phoneNumbers.reduce(
+      (savedNumber, number) => (number.length > savedNumber.length ? number : savedNumber),
+      '',
+    );
+
+    const contact_with9 = contacts.find((contact) => contact.phone_number === phone);
+    if (contact_with9) {
+      return contact_with9;
+    }
+
    for (const contact of contacts) {
      for (const field of searchableFields) {
        if (contact[field] && phoneNumbers.includes(contact[field])) {
@@ -447,7 +489,7 @@ export class ChatwootService {
  }

  private getSearchableFields() {
-    return ['phone_number', 'identifier'];
+    return ['phone_number'];
  }

  private getFilterPayload(query: string) {
@@ -461,7 +503,7 @@ export class ChatwootService {
        const queryOperator = fieldsToSearch.length - 1 === index1 && numbers.length - 1 === index2 ? null : 'OR';
        filterPayload.push({
          attribute_key: field,
-          filter_operator: ['phone_number', 'identifier'].includes(field) ? 'equal_to' : 'contains',
+          filter_operator: 'equal_to',
          values: [number.replace('+', '')],
          query_operator: queryOperator,
        });
@@ -559,53 +601,44 @@ export class ChatwootService {

      const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(chatId);

-      const findContact = await this.findContact(instance, chatId);
+      let contact = await this.findContact(instance, chatId);

-      let contact: any;
-      if (body.key.fromMe) {
-        if (findContact) {
-          contact = await this.updateContact(instance, findContact.id, {
-            avatar_url: picture_url.profilePictureUrl || null,
-          });
-        } else {
-          const jid = isGroup ? null : body.key.remoteJid;
-          contact = await this.createContact(
-            instance,
-            chatId,
-            filterInbox.id,
-            isGroup,
-            nameContact,
-            picture_url.profilePictureUrl || null,
-            jid,
-          );
+      if (contact) {
+        if (!body.key.fromMe) {
+          const waProfilePictureFile =
+            picture_url?.profilePictureUrl?.split('#')[0].split('?')[0].split('/').pop() || '';
+          const chatwootProfilePictureFile = contact?.thumbnail?.split('#')[0].split('?')[0].split('/').pop() || '';
+          const pictureNeedsUpdate = waProfilePictureFile !== chatwootProfilePictureFile;
+          const nameNeedsUpdate =
+            !contact.name ||
+            contact.name === chatId ||
+            (`+${chatId}`.startsWith('+55')
+              ? this.getNumbers(`+${chatId}`).some(
+                  (v) => contact.name === v || contact.name === v.substring(3) || contact.name === v.substring(1),
+                )
+              : false);
+
+          const contactNeedsUpdate = pictureNeedsUpdate || nameNeedsUpdate;
+          if (contactNeedsUpdate) {
+            this.logger.verbose('update contact in chatwoot');
+            contact = await this.updateContact(instance, contact.id, {
+              ...(nameNeedsUpdate && { name: nameContact }),
+              ...(waProfilePictureFile === '' && { avatar: null }),
+              ...(pictureNeedsUpdate && { avatar_url: picture_url?.profilePictureUrl }),
+            });
+          }
        }
      } else {
-        if (findContact) {
-          if (!findContact.name || findContact.name === chatId) {
-            contact = await this.updateContact(instance, findContact.id, {
-              name: nameContact,
-              avatar_url: picture_url.profilePictureUrl || null,
-            });
-          } else {
-            contact = await this.updateContact(instance, findContact.id, {
-              avatar_url: picture_url.profilePictureUrl || null,
-            });
-          }
-          if (!contact) {
-            contact = await this.findContact(instance, chatId);
-          }
-        } else {
-          const jid = isGroup ? null : body.key.remoteJid;
-          contact = await this.createContact(
-            instance,
-            chatId,
-            filterInbox.id,
-            isGroup,
-            nameContact,
-            picture_url.profilePictureUrl || null,
-            jid,
-          );
-        }
+        const jid = isGroup ? null : body.key.remoteJid;
+        contact = await this.createContact(
+          instance,
+          chatId,
+          filterInbox.id,
+          isGroup,
+          nameContact,
+          picture_url.profilePictureUrl || null,
+          jid,
+        );
      }

      if (!contact) {
@@ -615,20 +648,13 @@ export class ChatwootService {

      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');
-        await this.updateContact(instance, contactId, {
-          name: nameContact,
-        });
-      }
-
      this.logger.verbose('get contact conversations in chatwoot');
      const contactConversations = (await client.contacts.listConversations({
        accountId: this.provider.account_id,
        id: contactId,
      })) as any;

-      if (contactConversations) {
+      if (contactConversations?.payload?.length) {
        let conversation: any;
        if (this.provider.reopen_conversation) {
          conversation = contactConversations.payload.find((conversation) => conversation.inbox_id == filterInbox.id);
@@ -710,7 +736,7 @@ export class ChatwootService {
    }

    this.logger.verbose('find inbox by name');
-    const findByName = inbox.payload.find((inbox) => inbox.name === instance.instanceName.split('-cwId-')[0]);
+    const findByName = inbox.payload.find((inbox) => inbox.name === this.getClientCwConfig().name_inbox);

    if (!findByName) {
      this.logger.warn('inbox not found');
@@ -787,26 +813,15 @@ export class ChatwootService {
      return null;
    }

-    const payload = [
-      ['inbox_id', inbox.id.toString()],
-      ['contact_id', contact.id.toString()],
-      ['status', 'open'],
-    ];
+    const conversations = (await client.contacts.listConversations({
+      accountId: this.provider.account_id,
+      id: contact.id,
+    })) as any;

    return (
-      (
-        (await client.conversations.filter({
-          accountId: this.provider.account_id,
-          payload: payload.map((item, i, payload) => {
-            return {
-              attribute_key: item[0],
-              filter_operator: 'equal_to',
-              values: [item[1]],
-              query_operator: i < payload.length - 1 ? 'AND' : null,
-            };
-          }),
-        })) as { payload: conversation[] }
-      ).payload[0] || undefined
+      conversations.payload.find(
+        (conversation) => conversation.inbox_id === inbox.id && conversation.status === 'open',
+      ) || undefined
    );
  }

@@ -1106,6 +1121,26 @@ export class ChatwootService {
    }
  }

+  public async onSendMessageError(instance: InstanceDto, conversation: number, error?: string) {
+    const client = await this.clientCw(instance);
+
+    if (!client) {
+      return;
+    }
+
+    client.messages.create({
+      accountId: this.provider.account_id,
+      conversationId: conversation,
+      data: {
+        content: i18next.t('cw.message.notsent', {
+          error: error?.length > 0 ? `_${error}_` : '',
+        }),
+        message_type: 'outgoing',
+        private: true,
+      },
+    });
+  }
+
  public async receiveWebhook(instance: InstanceDto, body: any) {
    try {
      await new Promise((resolve) => setTimeout(resolve, 500));
@@ -1274,6 +1309,11 @@ export class ChatwootService {
          return { message: 'bot' };
        }

+        if (!waInstance && body.conversation?.id) {
+          this.onSendMessageError(instance, body.conversation?.id, 'Instance not found');
+          return { message: 'bot' };
+        }
+
        this.logger.verbose('Format message to send');
        let formatText: string;
        if (senderName === null || senderName === undefined) {
@@ -1310,6 +1350,9 @@ export class ChatwootService {
                formatText,
                options,
              );
+              if (!messageSent && body.conversation?.id) {
+                this.onSendMessageError(instance, body.conversation?.id);
+              }

              this.updateChatwootMessageId(
                {
@@ -1343,23 +1386,34 @@ export class ChatwootService {
              },
            };

-            const messageSent = await waInstance?.textMessage(data, true);
+            let messageSent: MessageRaw | proto.WebMessageInfo;
+            try {
+              messageSent = await waInstance?.textMessage(data, true);
+              if (!messageSent) {
+                throw new Error('Message not sent');
+              }

-            this.updateChatwootMessageId(
-              {
-                ...messageSent,
-                owner: instance.instanceName,
-              },
-              {
-                messageId: body.id,
-                inboxId: body.inbox?.id,
-                conversationId: body.conversation?.id,
-                contactInbox: {
-                  sourceId: body.conversation?.contact_inbox?.source_id,
+              this.updateChatwootMessageId(
+                {
+                  ...messageSent,
+                  owner: instance.instanceName,
                },
-              },
-              instance,
-            );
+                {
+                  messageId: body.id,
+                  inboxId: body.inbox?.id,
+                  conversationId: body.conversation?.id,
+                  contactInbox: {
+                    sourceId: body.conversation?.contact_inbox?.source_id,
+                  },
+                },
+                instance,
+              );
+            } catch (error) {
+              if (!messageSent && body.conversation?.id) {
+                this.onSendMessageError(instance, body.conversation?.id, error.toString());
+              }
+              throw error;
+            }
          }
        }

--- a/src/api/integrations/chatwoot/validate/chatwoot.schema.ts
+++ b/src/api/integrations/chatwoot/validate/chatwoot.schema.ts
@@ -30,10 +30,12 @@ export const chatwootSchema: JSONSchema7 = {
    url: { type: 'string' },
    sign_msg: { type: 'boolean', enum: [true, false] },
    sign_delimiter: { type: ['string', 'null'] },
+    name_inbox: { type: ['string', 'null'] },
    reopen_conversation: { type: 'boolean', enum: [true, false] },
    conversation_pending: { type: 'boolean', enum: [true, false] },
    auto_create: { type: 'boolean', enum: [true, false] },
    import_contacts: { type: 'boolean', enum: [true, false] },
+    merge_brazil_contacts: { type: 'boolean', enum: [true, false] },
    import_messages: { type: 'boolean', enum: [true, false] },
    days_limit_import_messages: { type: 'number' },
  },
--- a/src/api/integrations/rabbitmq/libs/amqp.server.ts
+++ b/src/api/integrations/rabbitmq/libs/amqp.server.ts
@@ -42,6 +42,41 @@ export const getAMQP = (): amqp.Channel | null => {
  return amqpChannel;
 };

+export const initGlobalQueues = () => {
+  logger.info('Initializing global queues');
+  const events = configService.get<Rabbitmq>('RABBITMQ').EVENTS;
+
+  if (!events) {
+    logger.warn('No events to initialize on AMQP');
+    return;
+  }
+
+  const eventKeys = Object.keys(events);
+
+  eventKeys.forEach((event) => {
+    if (events[event] === false) return;
+
+    const queueName = `${event.replace(/_/g, '.').toLowerCase()}`;
+    const amqp = getAMQP();
+    const exchangeName = 'evolution_exchange';
+
+    amqp.assertExchange(exchangeName, 'topic', {
+      durable: true,
+      autoDelete: false,
+    });
+
+    amqp.assertQueue(queueName, {
+      durable: true,
+      autoDelete: false,
+      arguments: {
+        'x-queue-type': 'quorum',
+      },
+    });
+
+    amqp.bindQueue(queueName, exchangeName, event);
+  });
+};
+
 export const initQueues = (instanceName: string, events: string[]) => {
  if (!events || !events.length) return;

--- a/src/api/integrations/sqs/libs/sqs.server.ts
+++ b/src/api/integrations/sqs/libs/sqs.server.ts
@@ -1,4 +1,4 @@
-import { SQS } from 'aws-sdk';
+import { SQS } from '@aws-sdk/client-sqs';

 import { configService, Sqs } from '../../../../config/env.config';
 import { Logger } from '../../../../config/logger.config';
@@ -12,8 +12,11 @@ export const initSQS = () => {
  return new Promise<void>((resolve, reject) => {
    const awsConfig = configService.get<Sqs>('SQS');
    sqs = new SQS({
-      accessKeyId: awsConfig.ACCESS_KEY_ID,
-      secretAccessKey: awsConfig.SECRET_ACCESS_KEY,
+      credentials: {
+        accessKeyId: awsConfig.ACCESS_KEY_ID,
+        secretAccessKey: awsConfig.SECRET_ACCESS_KEY,
+      },
+
      region: awsConfig.REGION,
    });

--- a/src/api/integrations/typebot/services/typebot.service.ts
+++ b/src/api/integrations/typebot/services/typebot.service.ts
@@ -519,18 +519,32 @@ export class TypebotService {
        text += element.text;
      }

-      if (
-        element.children &&
-        (element.type === 'p' ||
-          element.type === 'a' ||
-          element.type === 'inline-variable' ||
-          element.type === 'variable')
-      ) {
+      if (element.children && element.type !== 'a') {
        for (const child of element.children) {
          text += applyFormatting(child);
        }
      }

+      if (element.type === 'p') {
+        text = text.trim() + '\n';
+      }
+
+      if (element.type === 'ol') {
+        text =
+          '\n' +
+          text
+            .split('\n')
+            .map((line, index) => (line ? `${index + 1}. ${line}` : ''))
+            .join('\n');
+      }
+
+      if (element.type === 'li') {
+        text = text
+          .split('\n')
+          .map((line) => (line ? `  ${line}` : ''))
+          .join('\n');
+      }
+
      let formats = '';

      if (element.bold) {
--- a/src/api/models/integration.model.ts
+++ b/src/api/models/integration.model.ts
@@ -9,12 +9,12 @@ export class IntegrationRaw {
  token?: string;
 }

-const sqsSchema = new Schema<IntegrationRaw>({
+const integrationSchema = new Schema<IntegrationRaw>({
  _id: { type: String, _id: true },
  integration: { type: String, required: true },
  number: { type: String, required: true },
  token: { type: String, required: true },
 });

-export const IntegrationModel = dbserver?.model(IntegrationRaw.name, sqsSchema, 'integration');
+export const IntegrationModel = dbserver?.model(IntegrationRaw.name, integrationSchema, 'integration');
 export type IntegrationModel = typeof IntegrationModel;
--- a/src/api/models/message.model.ts
+++ b/src/api/models/message.model.ts
@@ -32,6 +32,7 @@ export class MessageRaw {
  source_reply_id?: string;
  chatwoot?: ChatwootMessage;
  contextInfo?: any;
+  status?: wa.StatusMessage | any;
 }

 type MessageRawBoolean<T> = {
--- a/src/api/repository/auth.repository.ts
+++ b/src/api/repository/auth.repository.ts
@@ -68,6 +68,20 @@ export class AuthRepository extends Repository {
    }
  }

+  public async findByKey(key: string): Promise<AuthRaw> {
+    try {
+      this.logger.verbose('finding auth');
+      if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding auth in db');
+        return await this.authModel.findOne({ apikey: key });
+      }
+
+      return {};
+    } catch (error) {
+      return {};
+    }
+  }
+
  public async list(): Promise<AuthRaw[]> {
    try {
      if (this.dbSettings.ENABLED) {
--- a/src/api/routes/chat.router.ts
+++ b/src/api/routes/chat.router.ts
@@ -6,6 +6,7 @@ import {
  blockUserSchema,
  contactValidateSchema,
  deleteMessageSchema,
+  markChatUnreadSchema,
  messageUpSchema,
  messageValidateSchema,
  presenceSchema,
@@ -24,6 +25,7 @@ import {
  BlockUserDto,
  DeleteMessage,
  getBase64FromMediaMessageDto,
+  MarkChatUnreadDto,
  NumberDto,
  PrivacySettingDto,
  ProfileNameDto,
@@ -98,6 +100,23 @@ export class ChatRouter extends RouterBroker {

        return res.status(HttpStatus.CREATED).json(response);
      })
+      .put(this.routerPath('markChatUnread'), ...guards, async (req, res) => {
+        logger.verbose('request received in markChatUnread');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
+        const response = await this.dataValidate<MarkChatUnreadDto>({
+          request: req,
+          schema: markChatUnreadSchema,
+          ClassRef: MarkChatUnreadDto,
+          execute: (instance, data) => chatController.markChatUnread(instance, data),
+        });
+
+        return res.status(HttpStatus.CREATED).json(response);
+      })
      .delete(this.routerPath('deleteMessageForEveryone'), ...guards, async (req, res) => {
        logger.verbose('request received in deleteMessageForEveryone');
        logger.verbose('request body: ');
--- a/src/api/routes/instance.router.ts
+++ b/src/api/routes/instance.router.ts
@@ -103,13 +103,15 @@ export class InstanceRouter extends RouterBroker {
        logger.verbose('request body: ');
        logger.verbose(req.body);

+        const key = req.get('apikey');
+
        logger.verbose('request query: ');
        logger.verbose(req.query);
        const response = await this.dataValidate<InstanceDto>({
          request: req,
          schema: null,
          ClassRef: InstanceDto,
-          execute: (instance) => instanceController.fetchInstances(instance),
+          execute: (instance) => instanceController.fetchInstances(instance, key),
        });

        return res.status(HttpStatus.OK).json(response);
--- a/src/api/services/whatsapp.service.ts
+++ b/src/api/services/whatsapp.service.ts
@@ -13,6 +13,7 @@ import {
  Database,
  HttpServer,
  Log,
+  Rabbitmq,
  Sqs,
  Webhook,
  Websocket,
@@ -38,17 +39,17 @@ import { waMonitor } from '../server.module';
 import { Events, wa } from '../types/wa.types';
 import { CacheService } from './cache.service';

-export class WAStartupService {
+export class ChannelStartupService {
  constructor(
    public readonly configService: ConfigService,
    public readonly eventEmitter: EventEmitter2,
    public readonly repository: RepositoryBroker,
    public readonly chatwootCache: CacheService,
  ) {
-    this.logger.verbose('WAStartupService initialized');
+    this.logger.verbose('ChannelStartupService initialized');
  }

-  public readonly logger = new Logger(WAStartupService.name);
+  public readonly logger = new Logger(ChannelStartupService.name);

  public client: WASocket;
  public readonly instance: wa.Instance = {};
@@ -136,11 +137,13 @@ export class WAStartupService {

  public async findIntegration() {
    this.logger.verbose('Finding integration');
-    const data = await this.repository.integration.find(this.instanceName);
+    let data: any;
+
+    data = await this.repository.integration.find(this.instanceName);

    if (!data) {
-      this.logger.verbose('Integration not found');
-      throw new NotFoundException('Integration not found');
+      this.repository.integration.create({ integration: 'WHATSAPP-BAILEYS', number: '', token: '' }, this.instanceName);
+      data = { integration: 'WHATSAPP-BAILEYS', number: '', token: '' };
    }

    this.logger.verbose(`Integration: ${data.integration}`);
@@ -303,6 +306,9 @@ export class WAStartupService {
    this.localChatwoot.conversation_pending = data?.conversation_pending;
    this.logger.verbose(`Chatwoot conversation pending: ${this.localChatwoot.conversation_pending}`);

+    this.localChatwoot.merge_brazil_contacts = data?.merge_brazil_contacts;
+    this.logger.verbose(`Chatwoot merge brazil contacts: ${this.localChatwoot.merge_brazil_contacts}`);
+
    this.localChatwoot.import_contacts = data?.import_contacts;
    this.logger.verbose(`Chatwoot import contacts: ${this.localChatwoot.import_contacts}`);

@@ -326,6 +332,7 @@ export class WAStartupService {
    this.logger.verbose(`Chatwoot sign delimiter: ${data.sign_delimiter}`);
    this.logger.verbose(`Chatwoot reopen conversation: ${data.reopen_conversation}`);
    this.logger.verbose(`Chatwoot conversation pending: ${data.conversation_pending}`);
+    this.logger.verbose(`Chatwoot merge brazil contacts: ${data.merge_brazil_contacts}`);
    this.logger.verbose(`Chatwoot import contacts: ${data.import_contacts}`);
    this.logger.verbose(`Chatwoot import messages: ${data.import_messages}`);
    this.logger.verbose(`Chatwoot days limit import messages: ${data.days_limit_import_messages}`);
@@ -354,6 +361,7 @@ export class WAStartupService {
    this.logger.verbose(`Chatwoot sign delimiter: ${data.sign_delimiter}`);
    this.logger.verbose(`Chatwoot reopen conversation: ${data.reopen_conversation}`);
    this.logger.verbose(`Chatwoot conversation pending: ${data.conversation_pending}`);
+    this.logger.verbose(`Chatwoot merge brazilian contacts: ${data.merge_brazil_contacts}`);
    this.logger.verbose(`Chatwoot import contacts: ${data.import_contacts}`);
    this.logger.verbose(`Chatwoot import messages: ${data.import_messages}`);
    this.logger.verbose(`Chatwoot days limit import messages: ${data.days_limit_import_messages}`);
@@ -368,6 +376,7 @@ export class WAStartupService {
      sign_delimiter: data.sign_delimiter || null,
      reopen_conversation: data.reopen_conversation,
      conversation_pending: data.conversation_pending,
+      merge_brazil_contacts: data.merge_brazil_contacts,
      import_contacts: data.import_contacts,
      import_messages: data.import_messages,
      days_limit_import_messages: data.days_limit_import_messages,
@@ -684,6 +693,9 @@ export class WAStartupService {
    const rabbitmqLocal = this.localRabbitmq.events;
    const sqsLocal = this.localSqs.events;
    const serverUrl = this.configService.get<HttpServer>('SERVER').URL;
+    const rabbitmqEnabled = this.configService.get<Rabbitmq>('RABBITMQ').ENABLED;
+    const rabbitmqGlobal = this.configService.get<Rabbitmq>('RABBITMQ').GLOBAL_ENABLED;
+    const rabbitmqEvents = this.configService.get<Rabbitmq>('RABBITMQ').EVENTS;
    const we = event.replace(/[.-]/gm, '_').toUpperCase();
    const transformedWe = we.replace(/_/gm, '-').toLowerCase();
    const tzoffset = new Date().getTimezoneOffset() * 60000; //offset in milliseconds
@@ -694,67 +706,134 @@ export class WAStartupService {
    const tokenStore = await this.repository.auth.find(this.instanceName);
    const instanceApikey = tokenStore?.apikey || 'Apikey not found';

-    if (this.localRabbitmq.enabled) {
+    if (rabbitmqEnabled) {
      const amqp = getAMQP();
-
-      if (amqp) {
+      if (this.localRabbitmq.enabled && amqp) {
        if (Array.isArray(rabbitmqLocal) && rabbitmqLocal.includes(we)) {
          const exchangeName = this.instanceName ?? 'evolution_exchange';

-          // await amqp.assertExchange(exchangeName, 'topic', {
-          //   durable: true,
-          //   autoDelete: false,
-          // });
+          let retry = 0;

-          await this.assertExchangeAsync(amqp, exchangeName, 'topic', {
-            durable: true,
-            autoDelete: false,
-          });
+          while (retry < 3) {
+            try {
+              await amqp.assertExchange(exchangeName, 'topic', {
+                durable: true,
+                autoDelete: false,
+              });

-          const queueName = `${this.instanceName}.${event}`;
+              const queueName = `${this.instanceName}.${event}`;

-          await amqp.assertQueue(queueName, {
-            durable: true,
-            autoDelete: false,
-            arguments: {
-              'x-queue-type': 'quorum',
-            },
-          });
+              await amqp.assertQueue(queueName, {
+                durable: true,
+                autoDelete: false,
+                arguments: {
+                  'x-queue-type': 'quorum',
+                },
+              });

-          await amqp.bindQueue(queueName, exchangeName, event);
+              await amqp.bindQueue(queueName, exchangeName, event);

-          const message = {
-            event,
-            instance: this.instance.name,
-            data,
-            server_url: serverUrl,
-            date_time: now,
-            sender: this.wuid,
-          };
+              const message = {
+                event,
+                instance: this.instance.name,
+                data,
+                server_url: serverUrl,
+                date_time: now,
+                sender: this.wuid,
+              };

-          if (expose && instanceApikey) {
-            message['apikey'] = instanceApikey;
+              if (expose && instanceApikey) {
+                message['apikey'] = instanceApikey;
+              }
+
+              await amqp.publish(exchangeName, event, Buffer.from(JSON.stringify(message)));
+
+              if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
+                const logData = {
+                  local: ChannelStartupService.name + '.sendData-RabbitMQ',
+                  event,
+                  instance: this.instance.name,
+                  data,
+                  server_url: serverUrl,
+                  apikey: (expose && instanceApikey) || null,
+                  date_time: now,
+                  sender: this.wuid,
+                };
+
+                if (expose && instanceApikey) {
+                  logData['apikey'] = instanceApikey;
+                }
+
+                this.logger.log(logData);
+              }
+              break;
+            } catch (error) {
+              retry++;
+            }
          }
+        }
+      }

-          await amqp.publish(exchangeName, event, Buffer.from(JSON.stringify(message)));
+      if (rabbitmqGlobal && rabbitmqEvents[we] && amqp) {
+        const exchangeName = 'evolution_exchange';

-          if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
-            const logData = {
-              local: WAStartupService.name + '.sendData-RabbitMQ',
+        let retry = 0;
+
+        while (retry < 3) {
+          try {
+            await amqp.assertExchange(exchangeName, 'topic', {
+              durable: true,
+              autoDelete: false,
+            });
+
+            const queueName = transformedWe;
+
+            await amqp.assertQueue(queueName, {
+              durable: true,
+              autoDelete: false,
+              arguments: {
+                'x-queue-type': 'quorum',
+              },
+            });
+
+            await amqp.bindQueue(queueName, exchangeName, event);
+
+            const message = {
              event,
              instance: this.instance.name,
              data,
              server_url: serverUrl,
-              apikey: (expose && instanceApikey) || null,
              date_time: now,
              sender: this.wuid,
            };

            if (expose && instanceApikey) {
-              logData['apikey'] = instanceApikey;
+              message['apikey'] = instanceApikey;
+            }
+            await amqp.publish(exchangeName, event, Buffer.from(JSON.stringify(message)));
+
+            if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
+              const logData = {
+                local: ChannelStartupService.name + '.sendData-RabbitMQ-Global',
+                event,
+                instance: this.instance.name,
+                data,
+                server_url: serverUrl,
+                apikey: (expose && instanceApikey) || null,
+                date_time: now,
+                sender: this.wuid,
+              };
+
+              if (expose && instanceApikey) {
+                logData['apikey'] = instanceApikey;
+              }
+
+              this.logger.log(logData);
            }

-            this.logger.log(logData);
+            break;
+          } catch (error) {
+            retry++;
          }
        }
      }
@@ -796,7 +875,7 @@ export class WAStartupService {
          sqs.sendMessage(params, (err, data) => {
            if (err) {
              this.logger.error({
-                local: WAStartupService.name + '.sendData-SQS',
+                local: ChannelStartupService.name + '.sendData-SQS',
                message: err?.message,
                hostName: err?.hostname,
                code: err?.code,
@@ -808,7 +887,7 @@ export class WAStartupService {
            } else {
              if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
                const logData = {
-                  local: WAStartupService.name + '.sendData-SQS',
+                  local: ChannelStartupService.name + '.sendData-SQS',
                  event,
                  instance: this.instance.name,
                  data,
@@ -852,7 +931,7 @@ export class WAStartupService {

        if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
          const logData = {
-            local: WAStartupService.name + '.sendData-WebsocketGlobal',
+            local: ChannelStartupService.name + '.sendData-WebsocketGlobal',
            event,
            instance: this.instance.name,
            data,
@@ -882,7 +961,7 @@ export class WAStartupService {

        if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
          const logData = {
-            local: WAStartupService.name + '.sendData-Websocket',
+            local: ChannelStartupService.name + '.sendData-Websocket',
            event,
            instance: this.instance.name,
            data,
@@ -916,7 +995,7 @@ export class WAStartupService {

        if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
          const logData = {
-            local: WAStartupService.name + '.sendDataWebhook-local',
+            local: ChannelStartupService.name + '.sendDataWebhook-local',
            url: baseURL,
            event,
            instance: this.instance.name,
@@ -956,7 +1035,7 @@ export class WAStartupService {
          }
        } catch (error) {
          this.logger.error({
-            local: WAStartupService.name + '.sendDataWebhook-local',
+            local: ChannelStartupService.name + '.sendDataWebhook-local',
            message: error?.message,
            hostName: error?.hostname,
            syscall: error?.syscall,
@@ -988,7 +1067,7 @@ export class WAStartupService {

        if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
          const logData = {
-            local: WAStartupService.name + '.sendDataWebhook-global',
+            local: ChannelStartupService.name + '.sendDataWebhook-global',
            url: globalURL,
            event,
            instance: this.instance.name,
@@ -1027,7 +1106,7 @@ export class WAStartupService {
          }
        } catch (error) {
          this.logger.error({
-            local: WAStartupService.name + '.sendDataWebhook-global',
+            local: ChannelStartupService.name + '.sendDataWebhook-global',
            message: error?.message,
            hostName: error?.hostname,
            syscall: error?.syscall,
--- a/src/api/services/channels/whatsapp.baileys.service.ts
+++ b/src/api/services/channels/whatsapp.baileys.service.ts
@@ -40,7 +40,7 @@ import { Label } from '@whiskeysockets/baileys/lib/Types/Label';
 import { LabelAssociation } from '@whiskeysockets/baileys/lib/Types/LabelAssociation';
 import axios from 'axios';
 import { exec } from 'child_process';
-import { arrayUnique, isBase64, isURL } from 'class-validator';
+import { isBase64, isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
 // import ffmpeg from 'fluent-ffmpeg';
 import fs, { existsSync, readFileSync } from 'fs';
@@ -68,6 +68,7 @@ import {
  DeleteMessage,
  getBase64FromMediaMessageDto,
  LastMessage,
+  MarkChatUnreadDto,
  NumberBusiness,
  OnWhatsAppDto,
  PrivacySettingDto,
@@ -97,7 +98,6 @@ import {
  MediaMessage,
  Options,
  SendAudioDto,
-  SendButtonDto,
  SendContactDto,
  SendListDto,
  SendLocationDto,
@@ -118,9 +118,9 @@ import { RepositoryBroker } from '../../repository/repository.manager';
 import { waMonitor } from '../../server.module';
 import { Events, MessageSubtype, TypeMediaMessage, wa } from '../../types/wa.types';
 import { CacheService } from './../cache.service';
-import { WAStartupService } from './../whatsapp.service';
+import { ChannelStartupService } from './../channel.service';

-export class BaileysStartupService extends WAStartupService {
+export class BaileysStartupService extends ChannelStartupService {
  constructor(
    public readonly configService: ConfigService,
    public readonly eventEmitter: EventEmitter2,
@@ -148,17 +148,17 @@ export class BaileysStartupService extends WAStartupService {
  public mobile: boolean;

  private async recoveringMessages() {
+    this.logger.info('Recovering messages lost');
    const cacheConf = this.configService.get<CacheConf>('CACHE');

    if ((cacheConf?.REDIS?.ENABLED && cacheConf?.REDIS?.URI !== '') || cacheConf?.LOCAL?.ENABLED) {
-      setTimeout(async () => {
-        this.logger.info('Recovering messages');
+      setInterval(async () => {
        this.messagesLostCache.keys().then((keys) => {
          keys.forEach(async (key) => {
            const message = await this.messagesLostCache.get(key.split(':')[2]);

            if (message.messageStubParameters && message.messageStubParameters[0] === 'Message absent from node') {
-              this.logger.verbose('Message absent from node, retrying to send, key: ' + key.split(':')[2]);
+              this.logger.info('Message absent from node, retrying to send, key: ' + key.split(':')[2]);
              await this.client.sendMessageAck(JSON.parse(message.messageStubParameters[1], BufferJSON.reviver));
            }
          });
@@ -496,13 +496,24 @@ export class BaileysStartupService extends WAStartupService {
        this.mobile = mobile;
      }

-      const { version } = await fetchLatestBaileysVersion();
-
-      this.logger.verbose('Baileys version: ' + version);
      const session = this.configService.get<ConfigSessionPhone>('CONFIG_SESSION_PHONE');
      const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];
      this.logger.verbose('Browser: ' + JSON.stringify(browser));

+      let version;
+      let log;
+
+      if (session.VERSION) {
+        version = session.VERSION.split(',');
+        log = `Baileys version env: ${version}`;
+      } else {
+        const baileysVersion = await fetchLatestBaileysVersion();
+        version = baileysVersion.version;
+        log = `Baileys version: ${version}`;
+      }
+
+      this.logger.info(log);
+
      let options;

      if (this.localProxy.enabled) {
@@ -517,6 +528,7 @@ export class BaileysStartupService extends WAStartupService {
            const proxyUrl = 'http://' + proxyUrls[rand];
            options = {
              agent: makeProxyAgent(proxyUrl),
+              fetchAgent: makeProxyAgent(proxyUrl),
            };
          } catch (error) {
            this.localProxy.enabled = false;
@@ -524,6 +536,7 @@ export class BaileysStartupService extends WAStartupService {
        } else {
          options = {
            agent: makeProxyAgent(this.localProxy.proxy),
+            fetchAgent: makeProxyAgent(this.localProxy.proxy),
          };
        }
      }
@@ -669,10 +682,23 @@ export class BaileysStartupService extends WAStartupService {
    try {
      this.instance.authState = await this.defineAuthState();

-      const { version } = await fetchLatestBaileysVersion();
      const session = this.configService.get<ConfigSessionPhone>('CONFIG_SESSION_PHONE');
      const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];

+      let version;
+      let log;
+
+      if (session.VERSION) {
+        version = session.VERSION.split(',');
+        log = `Baileys version env: ${version}`;
+      } else {
+        const baileysVersion = await fetchLatestBaileysVersion();
+        version = baileysVersion.version;
+        log = `Baileys version: ${version}`;
+      }
+
+      this.logger.info(log);
+
      let options;

      if (this.localProxy.enabled) {
@@ -687,6 +713,7 @@ export class BaileysStartupService extends WAStartupService {
            const proxyUrl = 'http://' + proxyUrls[rand];
            options = {
              agent: makeProxyAgent(proxyUrl),
+              fetchAgent: makeProxyAgent(proxyUrl),
            };
          } catch (error) {
            this.localProxy.enabled = false;
@@ -694,6 +721,7 @@ export class BaileysStartupService extends WAStartupService {
        } else {
          options = {
            agent: makeProxyAgent(this.localProxy.proxy),
+            fetchAgent: makeProxyAgent(this.localProxy.proxy),
          };
        }
      }
@@ -997,6 +1025,15 @@ export class BaileysStartupService extends WAStartupService {
            continue;
          }

+          const status: Record<number, wa.StatusMessage> = {
+            0: 'ERROR',
+            1: 'PENDING',
+            2: 'SERVER_ACK',
+            3: 'DELIVERY_ACK',
+            4: 'READ',
+            5: 'PLAYED',
+          };
+
          messagesRaw.push({
            key: m.key,
            pushName: m.pushName || m.key.remoteJid.split('@')[0],
@@ -1005,6 +1042,7 @@ export class BaileysStartupService extends WAStartupService {
            messageType: getContentType(m.message),
            messageTimestamp: m.messageTimestamp as number,
            owner: this.instance.name,
+            status: m.status ? status[m.status] : null,
          });
        }

@@ -1957,18 +1995,37 @@ export class BaileysStartupService extends WAStartupService {

      const sender = isWA.jid;

-      this.logger.verbose('Sending presence');
-      await this.client.presenceSubscribe(sender);
-      this.logger.verbose('Subscribing to presence');
+      if (data?.options?.delay && data?.options?.delay > 20000) {
+        let remainingDelay = data?.options.delay;
+        while (remainingDelay > 20000) {
+          await this.client.presenceSubscribe(sender);

-      await this.client.sendPresenceUpdate(data.options?.presence ?? 'composing', sender);
-      this.logger.verbose('Sending presence update: ' + data.options?.presence ?? 'composing');
+          await this.client.sendPresenceUpdate((data?.options?.presence as WAPresence) ?? 'composing', sender);

-      await delay(data.options.delay);
-      this.logger.verbose('Set delay: ' + data.options.delay);
+          await delay(20000);

-      await this.client.sendPresenceUpdate('paused', sender);
-      this.logger.verbose('Sending presence update: paused');
+          await this.client.sendPresenceUpdate('paused', sender);
+
+          remainingDelay -= 20000;
+        }
+        if (remainingDelay > 0) {
+          await this.client.presenceSubscribe(sender);
+
+          await this.client.sendPresenceUpdate((data?.options?.presence as WAPresence) ?? 'composing', sender);
+
+          await delay(remainingDelay);
+
+          await this.client.sendPresenceUpdate('paused', sender);
+        }
+      } else {
+        await this.client.presenceSubscribe(sender);
+
+        await this.client.sendPresenceUpdate((data?.options?.presence as WAPresence) ?? 'composing', sender);
+
+        await delay(data?.options?.delay);
+
+        await this.client.sendPresenceUpdate('paused', sender);
+      }
    } catch (error) {
      this.logger.error(error);
      throw new BadRequestException(error.toString());
@@ -2193,15 +2250,6 @@ export class BaileysStartupService extends WAStartupService {

          mimetype = response.headers['content-type'];
        }
-        // if (isURL(mediaMessage.media)) {
-        //   const response = await axios.get(mediaMessage.media, { responseType: 'arraybuffer' });
-
-        //   mimetype = response.headers['content-type'];
-        //   console.log('mediaMessage.mimetype2', mimetype);
-        // } else {
-        //   mimetype = getMIMEType(mediaMessage.fileName);
-        //   console.log('mediaMessage.mimetype3', mimetype);
-        // }
      }

      this.logger.verbose('Mimetype: ' + mimetype);
@@ -2316,82 +2364,6 @@ export class BaileysStartupService extends WAStartupService {
    return await this.sendMessageWithTyping(data.number, { ...generate.message }, data?.options, isChatwoot);
  }

-  // public async processAudio(audio: string, number: string) {
-  //   this.logger.verbose('Processing audio');
-  //   let tempAudioPath: string;
-  //   let outputAudio: string;
-
-  //   number = number.replace(/\D/g, '');
-  //   const hash = `${number}-${new Date().getTime()}`;
-  //   this.logger.verbose('Hash to audio name: ' + hash);
-
-  //   if (isURL(audio)) {
-  //     this.logger.verbose('Audio is url');
-
-  //     outputAudio = `${join(this.storePath, 'temp', `${hash}.ogg`)}`;
-  //     tempAudioPath = `${join(this.storePath, 'temp', `temp-${hash}.mp3`)}`;
-
-  //     this.logger.verbose('Output audio path: ' + outputAudio);
-  //     this.logger.verbose('Temp audio path: ' + tempAudioPath);
-
-  //     const timestamp = new Date().getTime();
-  //     const url = `${audio}?timestamp=${timestamp}`;
-
-  //     this.logger.verbose('Including timestamp in url: ' + url);
-
-  //     let config: any = {
-  //       responseType: 'arraybuffer',
-  //     };
-
-  //     if (this.localProxy.enabled) {
-  //       config = {
-  //         ...config,
-  //         httpsAgent: makeProxyAgent(this.localProxy.proxy),
-  //       };
-  //     }
-
-  //     const response = await axios.get(url, config);
-  //     this.logger.verbose('Getting audio from url');
-
-  //     fs.writeFileSync(tempAudioPath, response.data);
-  //   } else {
-  //     this.logger.verbose('Audio is base64');
-
-  //     outputAudio = `${join(this.storePath, 'temp', `${hash}.ogg`)}`;
-  //     tempAudioPath = `${join(this.storePath, 'temp', `temp-${hash}.mp3`)}`;
-
-  //     this.logger.verbose('Output audio path: ' + outputAudio);
-  //     this.logger.verbose('Temp audio path: ' + tempAudioPath);
-
-  //     const audioBuffer = Buffer.from(audio, 'base64');
-  //     fs.writeFileSync(tempAudioPath, audioBuffer);
-  //     this.logger.verbose('Temp audio created');
-  //   }
-
-  //   this.logger.verbose('Converting audio to mp4');
-  //   return new Promise((resolve, reject) => {
-  //     // This fix was suggested by @PurpShell
-  //     ffmpeg.setFfmpegPath(ffmpegPath.path);
-
-  //     ffmpeg()
-  //       .input(tempAudioPath)
-  //       .outputFormat('ogg')
-  //       .noVideo()
-  //       .audioCodec('libopus')
-  //       .save(outputAudio)
-  //       .on('error', function (error) {
-  //         console.log('error', error);
-  //         fs.unlinkSync(tempAudioPath);
-  //         if (error) reject(error);
-  //       })
-  //       .on('end', async function () {
-  //         fs.unlinkSync(tempAudioPath);
-  //         resolve(outputAudio);
-  //       })
-  //       .run();
-  //   });
-  // }
-
  public async processAudio(audio: string, number: string) {
    this.logger.verbose('Processing audio');
    let tempAudioPath: string;
@@ -2492,50 +2464,8 @@ export class BaileysStartupService extends WAStartupService {
    );
  }

-  public async buttonMessage(data: SendButtonDto) {
-    this.logger.verbose('Sending button message');
-    const embeddedMedia: any = {};
-    let mediatype = 'TEXT';
-
-    if (data.buttonMessage?.mediaMessage) {
-      mediatype = data.buttonMessage.mediaMessage?.mediatype.toUpperCase() ?? 'TEXT';
-      embeddedMedia.mediaKey = mediatype.toLowerCase() + 'Message';
-      const generate = await this.prepareMediaMessage(data.buttonMessage.mediaMessage);
-      embeddedMedia.message = generate.message[embeddedMedia.mediaKey];
-      embeddedMedia.contentText = `*${data.buttonMessage.title}*\n\n${data.buttonMessage.description}`;
-    }
-
-    const btnItems = {
-      text: data.buttonMessage.buttons.map((btn) => btn.buttonText),
-      ids: data.buttonMessage.buttons.map((btn) => btn.buttonId),
-    };
-
-    if (!arrayUnique(btnItems.text) || !arrayUnique(btnItems.ids)) {
-      throw new BadRequestException('Button texts cannot be repeated', 'Button IDs cannot be repeated.');
-    }
-
-    return await this.sendMessageWithTyping(
-      data.number,
-      {
-        buttonsMessage: {
-          text: !embeddedMedia?.mediaKey ? data.buttonMessage.title : undefined,
-          contentText: embeddedMedia?.contentText ?? data.buttonMessage.description,
-          footerText: data.buttonMessage?.footerText,
-          buttons: data.buttonMessage.buttons.map((button) => {
-            return {
-              buttonText: {
-                displayText: button.buttonText,
-              },
-              buttonId: button.buttonId,
-              type: 1,
-            };
-          }),
-          headerType: proto.Message.ButtonsMessage.HeaderType[mediatype],
-          [embeddedMedia?.mediaKey]: embeddedMedia?.message,
-        },
-      },
-      data?.options,
-    );
+  public async buttonMessage() {
+    throw new BadRequestException('Method not available on WhatsApp Baileys');
  }

  public async locationMessage(data: SendLocationDto) {
@@ -2828,6 +2758,45 @@ export class BaileysStartupService extends WAStartupService {
    }
  }

+  public async markChatUnread(data: MarkChatUnreadDto) {
+    this.logger.verbose('Marking chat as unread');
+
+    try {
+      let last_message = data.lastMessage;
+      let number = data.chat;
+
+      if (!last_message && number) {
+        last_message = await this.getLastMessage(number);
+      } else {
+        last_message = data.lastMessage;
+        last_message.messageTimestamp = last_message?.messageTimestamp ?? Date.now();
+        number = last_message?.key?.remoteJid;
+      }
+
+      if (!last_message || Object.keys(last_message).length === 0) {
+        throw new NotFoundException('Last message not found');
+      }
+
+      await this.client.chatModify(
+        {
+          markRead: false,
+          lastMessages: [last_message],
+        },
+        this.createJid(number),
+      );
+
+      return {
+        chatId: number,
+        markedChatUnread: true,
+      };
+    } catch (error) {
+      throw new InternalServerErrorException({
+        markedChatUnread: false,
+        message: ['An error occurred while marked unread the chat. Open a calling.', error.toString()],
+      });
+    }
+  }
+
  public async deleteMessage(del: DeleteMessage) {
    this.logger.verbose('Deleting message');
    try {
--- a/src/api/services/channels/whatsapp.business.service.ts
+++ b/src/api/services/channels/whatsapp.business.service.ts
@@ -26,9 +26,9 @@ import { ContactRaw, MessageRaw, MessageUpdateRaw, SettingsRaw } from '../../mod
 import { RepositoryBroker } from '../../repository/repository.manager';
 import { Events, wa } from '../../types/wa.types';
 import { CacheService } from './../cache.service';
-import { WAStartupService } from './../whatsapp.service';
+import { ChannelStartupService } from './../channel.service';

-export class BusinessStartupService extends WAStartupService {
+export class BusinessStartupService extends ChannelStartupService {
  constructor(
    public readonly configService: ConfigService,
    public readonly eventEmitter: EventEmitter2,
@@ -1258,6 +1258,9 @@ export class BusinessStartupService extends WAStartupService {
  public async archiveChat() {
    throw new BadRequestException('Method not available on WhatsApp Business API');
  }
+  public async markChatUnread() {
+    throw new BadRequestException('Method not available on WhatsApp Business API');
+  }
  public async fetchProfile() {
    throw new BadRequestException('Method not available on WhatsApp Business API');
  }
--- a/src/api/services/integration.service.ts
+++ b/src/api/services/integration.service.ts
@@ -22,7 +22,8 @@ export class IntegrationService {
      const result = await this.waMonitor.waInstances[instance.instanceName].findIntegration();

      if (Object.keys(result).length === 0) {
-        throw new Error('Integration not found');
+        this.create(instance, { integration: 'WHATSAPP-BAILEYS', number: '', token: '' });
+        return { integration: 'WHATSAPP-BAILEYS', number: '', token: '' };
      }

      return result;
--- a/src/api/services/monitor.service.ts
+++ b/src/api/services/monitor.service.ts
@@ -25,8 +25,8 @@ import {
 import { RepositoryBroker } from '../repository/repository.manager';
 import { Integration } from '../types/wa.types';
 import { CacheService } from './cache.service';
-import { BaileysStartupService } from './whatsapp/whatsapp.baileys.service';
-import { BusinessStartupService } from './whatsapp/whatsapp.business.service';
+import { BaileysStartupService } from './channels/whatsapp.baileys.service';
+import { BusinessStartupService } from './channels/whatsapp.business.service';

 export class WAMonitoringService {
  constructor(
@@ -83,7 +83,7 @@ export class WAMonitoringService {
    }
  }

-  public async instanceInfo(instanceName?: string) {
+  public async instanceInfo(instanceName?: string, arrayReturn = false) {
    this.logger.verbose('get instance info');
    if (instanceName && !this.waInstances[instanceName]) {
      throw new NotFoundException(`Instance "${instanceName}" not found`);
@@ -171,6 +171,9 @@ export class WAMonitoringService {

    this.logger.verbose('return instance info: ' + instances.length);

+    if (arrayReturn) {
+      return [instances.find((i) => i.instance.instanceName === instanceName) ?? instances];
+    }
    return instances.find((i) => i.instance.instanceName === instanceName) ?? instances;
  }

--- a/src/api/types/wa.types.ts
+++ b/src/api/types/wa.types.ts
@@ -69,6 +69,7 @@ export declare namespace wa {
    number?: string;
    reopen_conversation?: boolean;
    conversation_pending?: boolean;
+    merge_brazil_contacts?: boolean;
    import_contacts?: boolean;
    import_messages?: boolean;
    days_limit_import_messages?: number;
--- a/src/cache/cacheengine.ts
+++ b/src/cache/cacheengine.ts
@@ -1,8 +1,11 @@
 import { ICache } from '../api/abstract/abstract.cache';
 import { CacheConf, ConfigService } from '../config/env.config';
+import { Logger } from '../config/logger.config';
 import { LocalCache } from './localcache';
 import { RedisCache } from './rediscache';

+const logger = new Logger('Redis');
+
 export class CacheEngine {
  private engine: ICache;

@@ -14,6 +17,8 @@ export class CacheEngine {
    } else if (cacheConf?.LOCAL?.ENABLED) {
      this.engine = new LocalCache(configService, module);
    }
+
+    logger.info(`RedisCache initialized for ${module}`);
  }

  public getEngine() {
--- a/src/config/env.config.ts
+++ b/src/config/env.config.ts
@@ -63,11 +63,42 @@ export type Database = {
  SAVE_DATA: SaveData;
 };

+export type EventsRabbitmq = {
+  APPLICATION_STARTUP: boolean;
+  INSTANCE_CREATE: boolean;
+  INSTANCE_DELETE: boolean;
+  QRCODE_UPDATED: boolean;
+  MESSAGES_SET: boolean;
+  MESSAGES_UPSERT: boolean;
+  MESSAGES_UPDATE: boolean;
+  MESSAGES_DELETE: boolean;
+  SEND_MESSAGE: boolean;
+  CONTACTS_SET: boolean;
+  CONTACTS_UPDATE: boolean;
+  CONTACTS_UPSERT: boolean;
+  PRESENCE_UPDATE: boolean;
+  CHATS_SET: boolean;
+  CHATS_UPDATE: boolean;
+  CHATS_DELETE: boolean;
+  CHATS_UPSERT: boolean;
+  CONNECTION_UPDATE: boolean;
+  LABELS_EDIT: boolean;
+  LABELS_ASSOCIATION: boolean;
+  GROUPS_UPSERT: boolean;
+  GROUP_UPDATE: boolean;
+  GROUP_PARTICIPANTS_UPDATE: boolean;
+  CALL: boolean;
+  NEW_JWT_TOKEN: boolean;
+  TYPEBOT_START: boolean;
+  TYPEBOT_CHANGE_STATUS: boolean;
+};
+
 export type Rabbitmq = {
  ENABLED: boolean;
-  MODE: string; // global, single, isolated
-  EXCHANGE_NAME: string; // available for global and single, isolated mode will use instance name as exchange
  URI: string;
+  EXCHANGE_NAME: string;
+  GLOBAL_ENABLED: boolean;
+  EVENTS: EventsRabbitmq;
 };

 export type Sqs = {
@@ -155,7 +186,7 @@ export type CacheConfLocal = {
 };
 export type SslConf = { PRIVKEY: string; FULLCHAIN: string };
 export type Webhook = { GLOBAL?: GlobalWebhook; EVENTS: EventsWebhook };
-export type ConfigSessionPhone = { CLIENT: string; NAME: string };
+export type ConfigSessionPhone = { CLIENT: string; NAME: string; VERSION: string };
 export type QrCode = { LIMIT: number; COLOR: string };
 export type Typebot = { API_VERSION: string; KEEP_OPEN: boolean };
 export type Chatwoot = {
@@ -251,8 +282,8 @@ export class ConfigService {
        LABELS: process.env?.STORE_LABELS === 'true',
      },
      CLEAN_STORE: {
-        CLEANING_INTERVAL: Number.isInteger(process.env?.CLEAN_STORE_CLEANING_TERMINAL)
-          ? Number.parseInt(process.env.CLEAN_STORE_CLEANING_TERMINAL)
+        CLEANING_INTERVAL: Number.isInteger(process.env?.CLEAN_STORE_CLEANING_INTERVAL)
+          ? Number.parseInt(process.env.CLEAN_STORE_CLEANING_INTERVAL)
          : 7200,
        MESSAGES: process.env?.CLEAN_STORE_MESSAGES === 'true',
        MESSAGE_UP: process.env?.CLEAN_STORE_MESSAGE_UP === 'true',
@@ -276,9 +307,38 @@ export class ConfigService {
      },
      RABBITMQ: {
        ENABLED: process.env?.RABBITMQ_ENABLED === 'true',
-        MODE: process.env?.RABBITMQ_MODE || 'isolated',
+        GLOBAL_ENABLED: process.env?.RABBITMQ_GLOBAL_ENABLED === 'true',
        EXCHANGE_NAME: process.env?.RABBITMQ_EXCHANGE_NAME || 'evolution_exchange',
        URI: process.env.RABBITMQ_URI || '',
+        EVENTS: {
+          APPLICATION_STARTUP: process.env?.RABBITMQ_EVENTS_APPLICATION_STARTUP === 'true',
+          INSTANCE_CREATE: process.env?.RABBITMQ_EVENTS_INSTANCE_CREATE === 'true',
+          INSTANCE_DELETE: process.env?.RABBITMQ_EVENTS_INSTANCE_DELETE === 'true',
+          QRCODE_UPDATED: process.env?.RABBITMQ_EVENTS_QRCODE_UPDATED === 'true',
+          MESSAGES_SET: process.env?.RABBITMQ_EVENTS_MESSAGES_SET === 'true',
+          MESSAGES_UPSERT: process.env?.RABBITMQ_EVENTS_MESSAGES_UPSERT === 'true',
+          MESSAGES_UPDATE: process.env?.RABBITMQ_EVENTS_MESSAGES_UPDATE === 'true',
+          MESSAGES_DELETE: process.env?.RABBITMQ_EVENTS_MESSAGES_DELETE === 'true',
+          SEND_MESSAGE: process.env?.RABBITMQ_EVENTS_SEND_MESSAGE === 'true',
+          CONTACTS_SET: process.env?.RABBITMQ_EVENTS_CONTACTS_SET === 'true',
+          CONTACTS_UPDATE: process.env?.RABBITMQ_EVENTS_CONTACTS_UPDATE === 'true',
+          CONTACTS_UPSERT: process.env?.RABBITMQ_EVENTS_CONTACTS_UPSERT === 'true',
+          PRESENCE_UPDATE: process.env?.RABBITMQ_EVENTS_PRESENCE_UPDATE === 'true',
+          CHATS_SET: process.env?.RABBITMQ_EVENTS_CHATS_SET === 'true',
+          CHATS_UPDATE: process.env?.RABBITMQ_EVENTS_CHATS_UPDATE === 'true',
+          CHATS_UPSERT: process.env?.RABBITMQ_EVENTS_CHATS_UPSERT === 'true',
+          CHATS_DELETE: process.env?.RABBITMQ_EVENTS_CHATS_DELETE === 'true',
+          CONNECTION_UPDATE: process.env?.RABBITMQ_EVENTS_CONNECTION_UPDATE === 'true',
+          LABELS_EDIT: process.env?.RABBITMQ_EVENTS_LABELS_EDIT === 'true',
+          LABELS_ASSOCIATION: process.env?.RABBITMQ_EVENTS_LABELS_ASSOCIATION === 'true',
+          GROUPS_UPSERT: process.env?.RABBITMQ_EVENTS_GROUPS_UPSERT === 'true',
+          GROUP_UPDATE: process.env?.RABBITMQ_EVENTS_GROUPS_UPDATE === 'true',
+          GROUP_PARTICIPANTS_UPDATE: process.env?.RABBITMQ_EVENTS_GROUP_PARTICIPANTS_UPDATE === 'true',
+          CALL: process.env?.RABBITMQ_EVENTS_CALL === 'true',
+          NEW_JWT_TOKEN: process.env?.RABBITMQ_EVENTS_NEW_JWT_TOKEN === 'true',
+          TYPEBOT_START: process.env?.RABBITMQ_EVENTS_TYPEBOT_START === 'true',
+          TYPEBOT_CHANGE_STATUS: process.env?.RABBITMQ_EVENTS_TYPEBOT_CHANGE_STATUS === 'true',
+        },
      },
      SQS: {
        ENABLED: process.env?.SQS_ENABLED === 'true',
@@ -360,6 +420,7 @@ export class ConfigService {
      CONFIG_SESSION_PHONE: {
        CLIENT: process.env?.CONFIG_SESSION_PHONE_CLIENT || 'Evolution API',
        NAME: process.env?.CONFIG_SESSION_PHONE_NAME || 'Chrome',
+        VERSION: process.env?.CONFIG_SESSION_PHONE_VERSION || null,
      },
      QRCODE: {
        LIMIT: Number.parseInt(process.env.QRCODE_LIMIT) || 30,
--- a/src/dev-env.yml
+++ b/src/dev-env.yml
@@ -79,9 +79,35 @@ DATABASE:

 RABBITMQ:
  ENABLED: false
-  MODE: "global"
-  EXCHANGE_NAME: "evolution_exchange"
  URI: "amqp://guest:guest@localhost:5672"
+  EXCHANGE_NAME: evolution_exchange
+  GLOBAL_ENABLED: true
+  EVENTS:
+    APPLICATION_STARTUP: false
+    INSTANCE_CREATE: false
+    INSTANCE_DELETE: false
+    QRCODE_UPDATED: false
+    MESSAGES_SET: false
+    MESSAGES_UPSERT: true
+    MESSAGES_UPDATE: true
+    MESSAGES_DELETE: false
+    SEND_MESSAGE: false
+    CONTACTS_SET: false
+    CONTACTS_UPSERT: false
+    CONTACTS_UPDATE: false
+    PRESENCE_UPDATE: false
+    CHATS_SET: false
+    CHATS_UPSERT: false
+    CHATS_UPDATE: false
+    CHATS_DELETE: false
+    GROUPS_UPSERT: true
+    GROUP_UPDATE: true
+    GROUP_PARTICIPANTS_UPDATE: true
+    CONNECTION_UPDATE: true
+    CALL: false
+    # This events is used with Typebot
+    TYPEBOT_START: false
+    TYPEBOT_CHANGE_STATUS: false

 SQS:
  ENABLED: true
@@ -168,7 +194,7 @@ CHATWOOT:
    # This db connection is used to import messages from whatsapp to chatwoot database
    DATABASE:
      CONNECTION:
-        URI: "postgres://user:password@hostname:port/dbname"
+        URI: "postgres://user:password@hostname:port/dbname?sslmode=disable"
    PLACEHOLDER_MEDIA_MESSAGE: true

 # Cache to optimize application performance
--- a/src/docs/swagger.yaml
+++ b/src/docs/swagger.yaml
@@ -25,7 +25,7 @@ info:
    </font>

    [![Run in Postman](https://run.pstmn.io/button.svg)](https://god.gw.postman.com/run-collection/26869335-5546d063-156b-4529-915f-909dd628c090?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D26869335-5546d063-156b-4529-915f-909dd628c090%26entityType%3Dcollection%26workspaceId%3D339a4ee7-378b-45c9-b5b8-fd2c0a9c2442)
-  version: 1.7.3
+  version: 1.8.0
  contact:
    name: DavidsonGomes
    email: contato@agenciadgcode.com
@@ -194,6 +194,8 @@ paths:
            type: string
          description: Check the connection state of your instance.
          example: "evolution"
+      security:
+        - apikeyAuth: []
      responses:
        "200":
          description: Successful response
@@ -2242,6 +2244,9 @@ paths:
                conversation_pending:
                  type: boolean
                  description: "Indicates whether to mark conversations as pending."
+                merge_brazil_contacts:
+                  type: boolean
+                  description: "Indicates whether to merge Brazil numbers in case of numbers with and without ninth digit."
                import_contacts:
                  type: boolean
                  description: "Indicates whether to import contacts from phone to Chatwoot when connecting."
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,7 +6,7 @@ import cors from 'cors';
 import express, { json, NextFunction, Request, Response, urlencoded } from 'express';
 import { join } from 'path';

-import { initAMQP } from './api/integrations/rabbitmq/libs/amqp.server';
+import { initAMQP, initGlobalQueues } from './api/integrations/rabbitmq/libs/amqp.server';
 import { initSQS } from './api/integrations/sqs/libs/sqs.server';
 import { initIO } from './api/integrations/websocket/libs/socket.server';
 import { HttpStatus, router } from './api/routes/index.router';
@@ -128,7 +128,11 @@ function bootstrap() {

  initIO(server);

-  if (configService.get<Rabbitmq>('RABBITMQ')?.ENABLED) initAMQP();
+  if (configService.get<Rabbitmq>('RABBITMQ')?.ENABLED) {
+    initAMQP().then(() => {
+      if (configService.get<Rabbitmq>('RABBITMQ')?.GLOBAL_ENABLED) initGlobalQueues();
+    });
+  }

  if (configService.get<Sqs>('SQS')?.ENABLED) initSQS();

--- a/src/utils/translations/en.json
+++ b/src/utils/translations/en.json
@@ -22,5 +22,6 @@
  "cw.contactMessage.contact": "Contact",
  "cw.contactMessage.name": "Name",
  "cw.contactMessage.number": "Number",
+  "cw.message.notsent": "🚨 The message could not be sent. Please check your connection. {{error}}",
  "cw.message.edited": "Edited Message"
 }
--- a/src/utils/translations/es.json
+++ b/src/utils/translations/es.json
@@ -22,5 +22,6 @@
  "cw.contactMessage.contact": "Contacto",
  "cw.contactMessage.name": "Nombre",
  "cw.contactMessage.number": "Numero",
+  "cw.message.notsent": "🚨 El mensaje no se pudo enviar. Comprueba tu conexión. {{error}}",
  "cw.message.edited": "Mensaje editado"
 }
--- a/src/utils/translations/pt-BR.json
+++ b/src/utils/translations/pt-BR.json
@@ -22,5 +22,6 @@
  "cw.contactMessage.contact": "Contato",
  "cw.contactMessage.name": "Nome",
  "cw.contactMessage.number": "Número",
+  "cw.message.notsent": "🚨 Não foi possível enviar a mensagem. Verifique sua conexão. {{error}}",
  "cw.message.edited": "Mensagem editada"
 }
--- a/src/validate/validate.schema.ts
+++ b/src/validate/validate.schema.ts
@@ -597,6 +597,33 @@ export const archiveChatSchema: JSONSchema7 = {
  required: ['archive'],
 };

+export const markChatUnreadSchema: JSONSchema7 = {
+  $id: v4(),
+  type: 'object',
+  properties: {
+    chat: { type: 'string' },
+    lastMessage: {
+      type: 'object',
+      properties: {
+        key: {
+          type: 'object',
+          properties: {
+            id: { type: 'string' },
+            remoteJid: { type: 'string' },
+            fromMe: { type: 'boolean', enum: [true, false] },
+          },
+          required: ['id', 'fromMe', 'remoteJid'],
+          ...isNotEmpty('id', 'remoteJid'),
+        },
+        messageTimestamp: { type: 'integer', minLength: 1 },
+      },
+      required: ['key'],
+      ...isNotEmpty('messageTimestamp'),
+    },
+  },
+  required: ['lastMessage'],
+};
+
 export const deleteMessageSchema: JSONSchema7 = {
  $id: v4(),
  type: 'object',
--- a/views/manager-wip.hbs
+++ b/views/manager-wip.hbs
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html lang="pt-br">
-
-<head>
-   <meta charset="UTF-8">
-   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-   <link rel="shortcut icon" href="https://evolution-api.com/files/evolution-api-favicon.png" type="image/x-icon">
-
-   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css"
-      integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
-   <title>Instance Manager</title>
-</head>
-
-<body>
-   <div class="container mt-4">
-      <!-- Botão para abrir o modal de adicionar nova instância -->
-      <button class="btn btn-primary mb-3" data-toggle="modal" data-target="#actionModal" data-action="add">Nova
-         Instância</button>
-
-      <!-- Tabela de instâncias -->
-      <table class="table table-bordered">
-         <thead>
-            <tr>
-               <th>Nome da Instância</th>
-               <th>Status</th>
-               <th>API Key</th>
-               <th>Ações</th>
-            </tr>
-         </thead>
-         <tbody>
-            <!-- Iterando sobre as instâncias e preenchendo a tabela -->
-            {{#each instances}}
-            <tr>
-               <td>{{this.instance.instanceName}}</td>
-               <td>{{this.instance.status}}</td>
-               <td>{{this.instance.apikey}}</td>
-               <td>
-                  <!-- Dropdown de ações para cada instância -->
-                  <div class="dropdown">
-                     <button class="btn btn-secondary dropdown-toggle" type="button" id="actionDropdown"
-                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        Ações
-                     </button>
-                     <div class="dropdown-menu" aria-labelledby="actionDropdown">
-                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#actionModal"
-                           data-action="connect">Connect</a>
-                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#actionModal"
-                           data-action="restart">Restart</a>
-                        <!-- Adicione mais itens de ação aqui -->
-                        <!-- ... -->
-                     </div>
-                  </div>
-               </td>
-            </tr>
-            {{/each}}
-         </tbody>
-      </table>
-   </div>
-
-   <!-- Modal de ações -->
-   <div class="modal fade" id="actionModal" tabindex="-1" role="dialog" aria-labelledby="actionModalLabel"
-      aria-hidden="true">
-      <div class="modal-dialog" role="document">
-         <div class="modal-content">
-            <div class="modal-header">
-               <h5 class="modal-title" id="actionModalLabel">Ação</h5>
-               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                  <span aria-hidden="true">&times;</span>
-               </button>
-            </div>
-            <div class="modal-body">
-            </div>
-            <div class="modal-footer">
-               <button type="button" class="btn btn-secondary" data-dismiss="modal">Fechar</button>
-               <button type="button" class="btn btn-primary">Salvar</button>
-            </div>
-         </div>
-      </div>
-   </div>
-
-   <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js"
-      integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
-      crossorigin="anonymous"></script>
-   <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
-      integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"
-      crossorigin="anonymous"></script>
-   <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js"
-      integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+"
-      crossorigin="anonymous"></script>
-
-   <script>
-      $(document).ready(function(){
-         $('#actionModal').on('show.bs.modal', function(event) {
-         var button = $(event.relatedTarget);
-         var action = button.data('action');
-
-         console.log(action);
-
-         if (action === 'connect') {
-            
-         } else if (action === 'restart') {
-            
-         }
-      });
-      })
-   </script>
-</body>
-
-</html>
Author	SHA1	Message	Date
Davidson Gomes	05b5ae8a84	Merge branch 'release/1.8.0'	2024-05-27 16:36:03 -03:00
Davidson Gomes	2e9c14a0a8	fix: security fix in fetch instance with client key when not connected to mongodb	2024-05-27 16:35:59 -03:00
Davidson Gomes	3350cec589	fix: security fix in fetch instance with client key when not connected to mongodb	2024-05-27 16:35:55 -03:00
Davidson Gomes	bd7a42646b	Merge tag '1.8.0' into develop v	2024-05-27 16:24:29 -03:00
Davidson Gomes	2ae4ddee18	Merge branch 'release/1.8.0'	2024-05-27 16:24:25 -03:00
Davidson Gomes	2fb6e2b209	fix: Build in docker for linux/amd64, linux/arm64 platforms	2024-05-27 16:24:21 -03:00
Davidson Gomes	91f869b136	Merge tag '1.8.0' into develop v	2024-05-27 16:17:30 -03:00
Davidson Gomes	1284a97625	Merge branch 'release/1.8.0'	2024-05-27 16:17:27 -03:00
Davidson Gomes	3a5cfbf36f	fix: Build in docker for linux/amd64, linux/arm64 platforms	2024-05-27 16:17:22 -03:00
Davidson Gomes	47b8ecd43b	Merge tag '1.8.0' into develop v	2024-05-27 16:09:16 -03:00
Davidson Gomes	25ce1a4689	Merge branch 'release/1.8.0'	2024-05-27 16:09:12 -03:00
Davidson Gomes	a5156709ab	fix: Build in docker for linux/amd64, linux/arm64 platforms	2024-05-27 16:09:07 -03:00
Davidson Gomes	fd2d37d862	Merge tag '1.8.0' into develop v	2024-05-27 16:07:19 -03:00
Davidson Gomes	87bf433e9a	Merge branch 'release/1.8.0'	2024-05-27 16:07:15 -03:00
Davidson Gomes	b5ec79daae	fix: Build in docker for linux/amd64, linux/arm64 platforms	2024-05-27 16:07:03 -03:00
Davidson Gomes	3b19200997	Merge tag '1.7.6' into develop v	2024-05-27 15:54:45 -03:00
Davidson Gomes	0ab040080c	Merge branch 'release/1.7.6'	2024-05-27 15:54:42 -03:00
Davidson Gomes	5719896d18	fix: git actions	2024-05-27 15:54:31 -03:00
Davidson Gomes	e9e1cb6ebc	Merge tag '1.7.6' into develop v	2024-05-27 15:51:22 -03:00
Davidson Gomes	ceee6a7e74	Merge branch 'release/1.7.6'	2024-05-27 15:51:19 -03:00
Davidson Gomes	ebfc6d4fa5	fix: git actions	2024-05-27 15:51:06 -03:00
Davidson Gomes	0d62557a15	Merge pull request #609 from stack-app-br/main chore: build docker image to platforms: linux/amd64,linux/arm64	2024-05-27 15:45:28 -03:00
Davidson Gomes	097c09328f	Merge pull request #615 from deivisonrpg/fix-merge-brazil-contacts fix(chatwoot): add merge_brazil_contacts flag to ChannelStartupService and add logs	2024-05-27 15:34:56 -03:00
Davidson Gomes	732103292b	Merge pull request #618 from edisoncm-ti/develop fix: Correction to Postgres connection string in environment files	2024-05-27 15:34:29 -03:00
edisoncm-ti	3191e9b450	fix: Correction to Postgres connection string in environment files	2024-05-27 15:14:52 -03:00
Davidson Gomes	bf88fdbb31	fix: adjust send presence	2024-05-27 12:57:18 -03:00
Davidson Gomes	4c3fb5e762	correction in message formatting when generated by AI as markdown in typebot	2024-05-27 09:27:42 -03:00
Davidson Gomes	e4b6f4ff0d	correction in message formatting when generated by AI as markdown in typebot	2024-05-27 09:23:53 -03:00
Deivison Lincoln	ca0b0d4602	Add merge_brazil_contacts flag to ChannelStartupService	2024-05-25 10:09:37 -03:00
Deivison Lincoln	d7c3779ff7	fix: Add merge_brazil_contacts flag to ChannelStartupService	2024-05-25 10:05:04 -03:00
Davidson Gomes	f0d40eea15	New global mode for rabbitmq events	2024-05-24 18:48:54 -03:00
Davidson Gomes	68dcc1c86a	adjusts in create instance	2024-05-23 11:56:52 -03:00
Davidson Gomes	f7dcab3736	Now in the manager, when logging in with the client's apikey, the listing only shows the instance corresponding to the provided apikey (only with MongoDB)	2024-05-23 11:31:45 -03:00
Davidson Gomes	2fcb476c50	Now in the manager, when logging in with the client's apikey, the listing only shows the instance corresponding to the provided apikey (only with MongoDB)	2024-05-23 11:30:47 -03:00
Antonio Milesi Bastos	44a7cd62c8	Merge pull request #1 from stack-app-br/releases/1.7.5 chore: build docker image to platforms: linux/amd64,linux/arm64	2024-05-21 11:56:53 -03:00
@milesibastos	f7f0f8251b	chore: build docker image to platforms: linux/amd64,linux/arm64	2024-05-21 11:48:13 -03:00
Davidson Gomes	395b81a6ac	Merge tag '1.7.5' into develop v	2024-05-21 08:53:58 -03:00
Davidson Gomes	da06ed1185	Merge branch 'release/1.7.5'	2024-05-21 08:53:53 -03:00
Davidson Gomes	67afbd6a77	v1.7.5	2024-05-21 08:53:35 -03:00
Davidson Gomes	8fce53b4af	fixed version whatsapp web for baileys	2024-05-21 08:38:08 -03:00
Davidson Gomes	65bba23519	update baileys version	2024-05-20 19:53:23 -03:00
Davidson Gomes	283b497788	downgrade baileys version	2024-05-20 19:39:56 -03:00
Davidson Gomes	8cc1b8daa8	Merge pull request #590 from Ckk3/fix-envvar-CLEAN_STORE_CLEANING_INTERVAL Corrigindo variável inexistente do arquivo env.config.ts e substituindo pela correta CLEAN_STORE_CLEANING_INTERVAL	2024-05-09 14:15:09 -03:00
Davidson Gomes	9ccdb45a7a	Merge pull request #587 from deivisonrpg/chatwoot-merge-contact-with-nine feature(chatwoot): add merge_brazil_contacts function to solve nine digit in brazilian numbers	2024-05-09 14:12:31 -03:00
Davidson Gomes	f78d360c38	Merge pull request #586 from deivisonrpg/chatwoot-update-contact refactor(chatwoot): optimize ChatwootService method for updating contact inform…	2024-05-09 14:11:07 -03:00
Ckk3	6144fbe856	changing CLEAN_STORE_CLEANING_TERMINAL to CLEAN_STORE_CLEANING_INTERVAL	2024-05-09 13:21:28 -03:00
Deivison Lincoln	8446be7646	fix(chatwoot): fix grupos	2024-05-08 16:47:21 -03:00
Deivison Lincoln	8875ab1e93	feat: add merge_brazil_contacts flag to instance controller	2024-05-08 15:26:56 -03:00
Deivison Lincoln	7c207a50e1	feat: add merge_brazil_contacts to swagger doc	2024-05-08 15:11:37 -03:00
Deivison Lincoln	dcc32479ff	feature(chatwoot): add merge_brazil_contacts function to solve nine digit in brazilian numbers	2024-05-08 15:03:37 -03:00
Deivison Lincoln	09911c472d	refactor: optimize ChatwootService method for updating contact information	2024-05-08 14:34:03 -03:00
Davidson Gomes	7a0149ee23	Merge pull request #571 from stack-app-br/main chore: build docker image to platforms: linux/amd64, linux/arm64	2024-05-08 11:02:11 -03:00
Davidson Gomes	3ae8cf32b0	Merge pull request #584 from Al1st1c/fix/swagger-auth Fix/swagger auth	2024-05-08 09:56:59 -03:00
Davidson Gomes	11cf947bbb	Merge pull request #583 from deivisonrpg/chore-update-aws-sdk-v3 chore(aws sqs): update aws sdk v3	2024-05-08 09:56:24 -03:00
Davidson Gomes	60a20f61af	Merge pull request #582 from deivisonrpg/hotfix-getOpenConversationByContact fix(chatwoot): getOpenConversationByContact and init queries error	2024-05-08 09:55:08 -03:00
Davidson Gomes	e65c7b6bcf	Merge pull request #577 from neanderdev/mark-chat-as-unread feat: method to mark chat as unread	2024-05-08 09:54:37 -03:00
Al1stic	80c892aca3	fix env	2024-05-06 19:31:37 -03:00
dev2	39ee266598	fix: correcao swagger sem authkey	2024-05-06 19:28:57 -03:00
Deivison Lincoln	aa58d7744e	chore: update AWS SDK dependency to version 3.569.0	2024-05-06 17:28:41 -03:00
Deivison Lincoln	ea3b0b3712	fix: optimize ChatwootService method for retrieving open conversations	2024-05-06 16:30:16 -03:00
Deivison Lincoln	d9d8707123	chore: update baileys to version 6.7.2	2024-05-06 16:29:37 -03:00
Neander de Souza	8e9a1e2ba5	feat: method to mark chat as unread	2024-05-06 09:08:36 -03:00
Davidson Gomes	e29b4865e8	update baileys	2024-05-01 19:20:40 -03:00
@milesibastos	4b60ca175d	chore: build docker image to platforms: linux/amd64,linux/arm64	2024-04-30 17:48:35 -03:00
Davidson Gomes	2fbbc7b5a9	Merge tag '1.7.4' into develop v	2024-04-28 09:47:24 -03:00
Davidson Gomes	633dbb82d3	Merge branch 'release/1.7.4'	2024-04-28 09:47:19 -03:00
Davidson Gomes	95907b3cea	v 1.7.4	2024-04-28 09:47:06 -03:00
Davidson Gomes	14c210c771	fix: new version baileys	2024-04-28 09:41:22 -03:00
Davidson Gomes	00e7fcc46b	changelog	2024-04-27 13:13:43 -03:00
Davidson Gomes	720efcbcbf	Merge pull request #566 from judsonjuniorr/feat/cw-inbox-name Chatwoot inbox name	2024-04-27 13:13:06 -03:00
Davidson Gomes	d95791cc18	changelog	2024-04-27 13:12:29 -03:00
Davidson Gomes	d45b7af3b6	fix: recovering messages	2024-04-27 13:11:33 -03:00
Davidson Gomes	0ad3acaf07	Merge branch 'develop' of github.com:EvolutionAPI/evolution-api into develop	2024-04-24 18:55:49 -03:00
Davidson Gomes	e27818ecda	adjusts in integration	2024-04-24 18:55:38 -03:00
Davidson Gomes	ff21cf4d4c	Merge pull request #558 from jaison-x/pr2 feat(chatwoot): send private message on error message sent from chatwoot	2024-04-23 19:11:10 -03:00
Davidson Gomes	dc19c7fdec	Merge pull request #555 from jaison-x/pr fix(chatwoot): fix bug when chatwoot params reopen_conversation and conversation_pending are enabled	2024-04-23 19:10:57 -03:00
jaison-x	6c8ffd8ec6	feat(chatwoot): send private message on error message sent from chatwoot	2024-04-23 17:26:22 -03:00
jaison-x	96fdb210be	feat(chatwoot): send private message on error message sent from chatwoot	2024-04-23 17:15:41 -03:00
jaison-x	84ad8e0d6e	feat(chatwoot): send private message on error message sent from chatwoot	2024-04-23 15:09:28 -03:00
Davidson Gomes	53361682f4	Recovering messages	2024-04-23 08:01:59 -03:00
jaison-x	0ee243f284	fix(chatwoot): fix bug when chatwoot params reopen_conversation and conversation_pending are enabled	2024-04-22 13:41:06 -03:00
Judson Cairo	26ff0b634f	Revert "Update current inbox if exists" This reverts commit `f44ab0f678`.	2024-04-21 16:49:15 -03:00
Judson Cairo	f44ab0f678	Update current inbox if exists	2024-04-21 16:46:49 -03:00
Judson Cairo	1f128747bb	Fix inbox name on cw config	2024-04-21 16:37:27 -03:00
Judson Cairo	3bf975d90f	Set chatwoot custom inbox name	2024-04-21 16:33:20 -03:00
Davidson Gomes	92f8951be4	Merge tag '2.3.9' into develop v	2024-04-18 21:24:30 -03:00
Davidson Gomes	e071f56767	Merge branch 'release/2.3.9'	2024-04-18 21:24:27 -03:00
Davidson Gomes	c85619efcf	fix: Recovering messages lost with redis cache	2024-04-18 17:33:09 -03:00
Davidson Gomes	27f9ae1e56	fix: Recovering messages lost with redis cache	2024-04-18 17:31:10 -03:00
Davidson Gomes	7449102d95	fix: Recovering messages lost with redis cache	2024-04-18 17:31:05 -03:00
Davidson Gomes	234a2c71b5	Merge pull request #543 from PauloAK/history-set-message-status Adicionado message.status ao webhook MESSAGES_SET	2024-04-18 16:05:44 -03:00
Davidson Gomes	4dd5533202	fix: Adjusts in proxy on fetchAgent	2024-04-18 12:54:00 -03:00
Davidson Gomes	a4d1740754	fix: Adjusts in proxy on fetchAgent	2024-04-18 12:53:55 -03:00
Davidson Gomes	1a2ea1c38a	Merge tag '1.7.3' into develop * Revert fix audio encoding * Recovering messages lost with redis cache * Adjusts in redis for save instances * Adjusts in proxy * Revert pull request #523 * Added instance name on logs * Added support for Spanish * Fix error: invalid operator. The allowed operators for identifier are equal_to,not_equal_to in chatwoot	2024-04-18 12:12:40 -03:00
Paulo Kramer	bb974e10f5	Added message status to the messaging-history.set	2024-04-18 01:34:52 -03:00