From 064152555c3f2bea2f201d65c8efcee39e938c54 Mon Sep 17 00:00:00 2001 From: Duda Nogueira Date: Fri, 8 Mar 2024 09:11:06 -0300 Subject: [PATCH] More on evolution --- .envs/.local/.chatwoot | 2 +- chatwoot-compose.yml | 5 ++-- local.yml | 2 +- .../management/commands/dev_settings.py | 26 +++++++++++++++++++ rocket_connect/plugins/evolution.py | 14 +++------- rocketchat-compose.yml | 2 +- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/.envs/.local/.chatwoot b/.envs/.local/.chatwoot index ce8559d..e98ff76 100644 --- a/.envs/.local/.chatwoot +++ b/.envs/.local/.chatwoot @@ -27,7 +27,7 @@ REDIS_URL=redis://redis_chatwoot:6379 # If you are using docker-compose, set this variable's value to be any string, # which will be the password for the redis service running inside the docker-compose # to make it secure -REDIS_PASSWORD=pgpwd +#REDIS_PASSWORD=pgpwd # Redis Sentinel can be used by passing list of sentinel host and ports e,g. sentinel_host1:port1,sentinel_host2:port2 REDIS_SENTINELS= # Redis sentinel master name is required when using sentinel, default value is "mymaster". diff --git a/chatwoot-compose.yml b/chatwoot-compose.yml index cc309c2..37bbb2a 100644 --- a/chatwoot-compose.yml +++ b/chatwoot-compose.yml @@ -45,7 +45,7 @@ services: volumes: - postgres_storage:/var/lib/postgresql/data environment: - - POSTGRES_DB=chatwoot + - POSTGRES_DB=chatwoot_production - POSTGRES_USER=postgres # Please provide your own password. - POSTGRES_PASSWORD=pgpwd @@ -53,7 +53,8 @@ services: redis_chatwoot: image: redis:alpine restart: always - command: ["sh", "-c", "redis-server --requirepass \"$REDIS_PASSWORD\""] + #command: ["sh", "-c", "redis-server --requirepass \"$REDIS_PASSWORD\""] + command: ["sh", "-c", "redis-server"] env_file: ./.envs/.local/.chatwoot volumes: - redis_storage:/data diff --git a/local.yml b/local.yml index 35efc7d..678002d 100644 --- a/local.yml +++ b/local.yml @@ -261,7 +261,7 @@ services: - local_evolution_instances:/evolution/instances - local_evolution_store:/evolution/store env_file: - - ./compose/local/evolution/.env + - ./compose/local/evolution/env command: ['node', './dist/src/main.js'] apache: diff --git a/rocket_connect/instance/management/commands/dev_settings.py b/rocket_connect/instance/management/commands/dev_settings.py index 79f6a4f..b071d35 100644 --- a/rocket_connect/instance/management/commands/dev_settings.py +++ b/rocket_connect/instance/management/commands/dev_settings.py @@ -110,6 +110,32 @@ def handle_django(self): else: print("CONNECTOR UPDATED: ", connector) + + # + # create default evolution connector + # + + connector, connector_created = server.connectors.get_or_create( + external_token="ROCKETCHAT_EVOLUTION_EXTERNAL_TOKEN" + ) + connector.config = { + "webhook": "http://django.local:8000/connector/ROCKETCHAT_EVOLUTION_EXTERNAL_TOKEN/", + "endpoint": "http://evolution:8080", + "secret_key": "B6D711FCDE4D4FD5936544120E713976", + "instance_name": "rocketchat_evolution_test", + "include_connector_status": True, + "enable_ack_receipt": True, + "outcome_attachment_description_as_new_message": True, + } + connector.name = "EVOLUTION" + connector.connector_type = "evolution" + connector.save() + if connector_created: + print("CONNECTOR CREATED: ", connector) + else: + print("CONNECTOR UPDATED: ", connector) + + # # create default codechat connector # diff --git a/rocket_connect/plugins/evolution.py b/rocket_connect/plugins/evolution.py index 09f136d..e476734 100644 --- a/rocket_connect/plugins/evolution.py +++ b/rocket_connect/plugins/evolution.py @@ -64,21 +64,13 @@ def initialize(self): 'MESSAGES_UPDATE', 'MESSAGES_DELETE', 'SEND_MESSAGE', - 'CONTACTS_SET', - 'CONTACTS_UPSERT', - 'CONTACTS_UPDATE', - 'PRESENCE_UPDATE', 'CHATS_SET', 'CHATS_UPSERT', 'CHATS_UPDATE', - 'CHATS_DELETE', - 'GROUPS_UPSERT', - 'GROUP_UPDATE', - 'GROUP_PARTICIPANTS_UPDATE', 'CONNECTION_UPDATE', 'CALL', 'NEW_JWT_TOKEN'], - 'url': 'http://django.local:8000/connector/ROCKETCHAT_CODECHAT_EXTERNAL_TOKEN', + 'url': webhook_url, 'webhook_base64': True} connect_instance_response = requests.request( "POST", endpoint_webhook_set, json=payload, headers=headers @@ -452,10 +444,10 @@ def get_incoming_visitor_id(self): class ConnectorConfigForm(BaseConnectorConfigForm): webhook = forms.CharField( - help_text="Where WPPConnect will send the events", required=True, initial="" + help_text="Where Evolution will send the events", required=True, initial="" ) endpoint = forms.CharField( - help_text="Where your WPPConnect is installed", + help_text="Where your Evolution is installed", required=True, initial="http://codechat:8083", ) diff --git a/rocketchat-compose.yml b/rocketchat-compose.yml index b10e487..486f94d 100644 --- a/rocketchat-compose.yml +++ b/rocketchat-compose.yml @@ -43,7 +43,7 @@ services: mode: host mongodb: - image: docker.io/bitnami/mongodb:${MONGODB_VERSION:-5.0} + image: docker.io/bitnami/mongodb:${MONGODB_VERSION:-4.4} restart: on-failure volumes: - local_rocket_mongodb_data:/bitnami/mongodb