merging cherry picks into my main

.dockerignore

@@ -1,5 +1,7 @@
 .git
 *Dockerfile*
 *docker-compose*
+package-lock.json
+.env
 node_modules
 dist

.env.example

@@ -30,6 +30,7 @@ DATABASE_CONNECTION_URI='postgresql://user:pass@postgres:5432/evolution?schema=p
 # Client name for the database connection
 # It is used to separate an API installation from another that uses the same database.
 DATABASE_CONNECTION_CLIENT_NAME=evolution_exchange
+DATABASE_PORT=5432
 
 # Choose the data you want to save in the application's database
 DATABASE_SAVE_DATA_INSTANCE=true
@@ -62,6 +63,7 @@ RABBITMQ_EVENTS_MESSAGES_EDITED=false
 RABBITMQ_EVENTS_MESSAGES_UPDATE=false
 RABBITMQ_EVENTS_MESSAGES_DELETE=false
 RABBITMQ_EVENTS_SEND_MESSAGE=false
+RABBITMQ_EVENTS_SEND_MESSAGE_UPDATE=false
 RABBITMQ_EVENTS_CONTACTS_SET=false
 RABBITMQ_EVENTS_CONTACTS_UPSERT=false
 RABBITMQ_EVENTS_CONTACTS_UPDATE=false
@@ -108,6 +110,7 @@ PUSHER_EVENTS_MESSAGES_EDITED=true
 PUSHER_EVENTS_MESSAGES_UPDATE=true
 PUSHER_EVENTS_MESSAGES_DELETE=true
 PUSHER_EVENTS_SEND_MESSAGE=true
+PUSHER_EVENTS_SEND_MESSAGE_UPDATE=true
 PUSHER_EVENTS_CONTACTS_SET=true
 PUSHER_EVENTS_CONTACTS_UPSERT=true
 PUSHER_EVENTS_CONTACTS_UPDATE=true
@@ -149,6 +152,7 @@ WEBHOOK_EVENTS_MESSAGES_EDITED=true
 WEBHOOK_EVENTS_MESSAGES_UPDATE=true
 WEBHOOK_EVENTS_MESSAGES_DELETE=true
 WEBHOOK_EVENTS_SEND_MESSAGE=true
+WEBHOOK_EVENTS_SEND_MESSAGE_UPDATE=true
 WEBHOOK_EVENTS_CONTACTS_SET=true
 WEBHOOK_EVENTS_CONTACTS_UPSERT=true
 WEBHOOK_EVENTS_CONTACTS_UPDATE=true
@@ -221,6 +225,8 @@ CACHE_REDIS_PREFIX_KEY=evolution
 CACHE_REDIS_SAVE_INSTANCES=false
 # Local Cache enabled
 CACHE_LOCAL_ENABLED=false
+#Redis Port
+REDIS_PORT=6379
 
 # Amazon S3 - Environment variables
 S3_ENABLED=false

.github/workflows/publish_docker_image.yml

@@ -20,7 +20,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: atendai/evolution-api
+          images: evoapicloud/evolution-api
           tags: type=semver,pattern=v{{version}}
 
       - name: Set up QEMU

.github/workflows/publish_docker_image_homolog.yml

@@ -20,7 +20,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: atendai/evolution-api
+          images: evoapicloud/evolution-api
           tags: homolog
 
       - name: Set up QEMU

.github/workflows/publish_docker_image_latest.yml

@@ -20,7 +20,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: atendai/evolution-api
+          images: evoapicloud/evolution-api
           tags: latest
 
       - name: Set up QEMU

.gitignore

@@ -2,6 +2,8 @@
 /dist
 /node_modules
 
+.cursor*
+
 /Docker/.env
 
 .vscode

Docker/swarm/evolution_api_v2.yaml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   evolution_v2:
-    image: atendai/evolution-api:v2.1.2
+    image: evoapicloud/evolution-api:latest
     volumes:
       - evolution_instances:/evolution/instances
     networks:
@@ -34,6 +34,7 @@ services:
       - RABBITMQ_EVENTS_MESSAGES_UPDATE=false
       - RABBITMQ_EVENTS_MESSAGES_DELETE=false
       - RABBITMQ_EVENTS_SEND_MESSAGE=false
+      - RABBITMQ_EVENTS_SEND_MESSAGE_UPDATE=false
       - RABBITMQ_EVENTS_CONTACTS_SET=false
       - RABBITMQ_EVENTS_CONTACTS_UPSERT=false
       - RABBITMQ_EVENTS_CONTACTS_UPDATE=false
@@ -71,6 +72,7 @@ services:
       - WEBHOOK_EVENTS_MESSAGES_UPDATE=true
       - WEBHOOK_EVENTS_MESSAGES_DELETE=true
       - WEBHOOK_EVENTS_SEND_MESSAGE=true
+      - WEBHOOK_EVENTS_SEND_MESSAGE_UPDATE=true
       - WEBHOOK_EVENTS_CONTACTS_SET=true
       - WEBHOOK_EVENTS_CONTACTS_UPSERT=true
       - WEBHOOK_EVENTS_CONTACTS_UPDATE=true

Dockerfile

@@ -1,11 +1,11 @@
 FROM node:20-alpine AS builder
 
 RUN apk update && \
-    apk add git ffmpeg wget curl bash openssl
+    apk add --no-cache git ffmpeg wget curl bash openssl
 
 LABEL version="2.2.3" description="Api to control whatsapp features through http requests." 
 LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
-LABEL contact="contato@atendai.com"
+LABEL contact="contato@evolution-api.com"
 
 WORKDIR /evolution
 

LICENSE

@@ -8,7 +8,7 @@ a. LOGO and copyright information: In the process of using Evolution API's front
 
 b. Usage Notification Requirement: If Evolution API is used as part of any project, including closed-source systems (e.g., proprietary software), the user is required to display a clear notification within the system that Evolution API is being utilized. This notification should be visible to system administrators and accessible from the system's documentation or settings page. Failure to comply with this requirement may result in the necessity for a commercial license, as determined by the producer.
 
-Please contact contato@atendai.com to inquire about licensing matters.
+Please contact contato@evolution-api.com to inquire about licensing matters.
 
 2. As a contributor, you should agree that:
 

README.md

@@ -2,6 +2,7 @@
 
 <div align="center">
 
+[![Docker Image	(https://img.shields.io/badge/Docker-Image-blue)](https://hub.docker.com/r/evoapicloud/evolution-api)]
 [![Whatsapp Group](https://img.shields.io/badge/Group-WhatsApp-%2322BC18)](https://evolution-api.com/whatsapp)
 [![Discord Community](https://img.shields.io/badge/Discord-Community-blue)](https://evolution-api.com/discord)
 [![Postman Collection](https://img.shields.io/badge/Postman-Collection-orange)](https://evolution-api.com/postman) 
@@ -87,6 +88,7 @@ https://github.com/sponsors/EvolutionAPI
 We are proud to collaborate with the following content creators who have contributed valuable insights and tutorials about Evolution API:
 
 - [Promovaweb](https://www.youtube.com/@promovaweb)
+- [Sandeco](https://www.youtube.com/@canalsandeco)
 - [Comunidade ZDG](https://www.youtube.com/@ComunidadeZDG)
 - [Francis MNO](https://www.youtube.com/@FrancisMNO)
 - [Pablo Cabral](https://youtube.com/@pablocabral)
@@ -111,7 +113,7 @@ Evolution API is licensed under the Apache License 2.0, with the following addit
 
 2. **Usage Notification Requirement**: If Evolution API is used as part of any project, including closed-source systems (e.g., proprietary software), the user is required to display a clear notification within the system that Evolution API is being utilized. This notification should be visible to system administrators and accessible from the system's documentation or settings page. Failure to comply with this requirement may result in the necessity for a commercial license, as determined by the producer.
 
-Please contact contato@atendai.com to inquire about licensing matters.
+Please contact contato@evolution-api.com to inquire about licensing matters.
 
 Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
 

docker-compose.yaml

@@ -1,21 +1,22 @@
 services:
   api:
     container_name: evolution_api
-    image: atendai/evolution-api:homolog
+    build: .
+    #image: evoapicloud/evolution-api:latest
     restart: always
     depends_on:
       - redis
       - postgres
     ports:
-      - 8080:8080
+      - ${SERVER_PORT}:8080
     volumes:
       - evolution_instances:/evolution/instances
     networks:
       - evolution-net
     env_file:
       - .env
     expose:
-      - 8080
+      - ${SERVER_PORT}
 
   redis:
     image: redis:latest
@@ -27,7 +28,7 @@ services:
     volumes:
       - evolution_redis:/data
     ports:
-      - 6379:6379
+      - ${REDIS_PORT}:6379
 
   postgres:
     container_name: postgres
@@ -37,7 +38,7 @@ services:
     command: ["postgres", "-c", "max_connections=1000", "-c", "listen_addresses=*"]
     restart: always
     ports:
-      - 5432:5432
+      - ${DATABASE_PORT}:5432
     environment:
       - POSTGRES_USER=user
       - POSTGRES_PASSWORD=pass
@@ -46,7 +47,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     expose:
-      - 5432
+      - ${DATABASE_PORT}
 
 volumes:
   evolution_instances: