From 83f87bc1c58e2df30db9ea93921ea4a393deb59b Mon Sep 17 00:00:00 2001 From: Junior Vidotti Date: Wed, 11 Sep 2024 21:58:46 +0000 Subject: [PATCH 1/4] debounce message break --- .vscode/settings.json | 7 ++++--- src/api/integrations/chatbot/chatbot.controller.ts | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8f568c69..c9b35c82 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { - "editor.fontSize": 13, + // "editor.fontSize": 13, "editor.fontLigatures": true, - "editor.letterSpacing": 0.5, + // "editor.letterSpacing": 0.5, "editor.smoothScrolling": true, "editor.tabSize": 2, "editor.codeActionsOnSave": { @@ -12,5 +12,6 @@ "prisma-smart-formatter.prisma.defaultFormatter": "Prisma.prisma", "i18n-ally.localesPaths": [ "store/messages" - ] + ], + "deno.enable": false } \ No newline at end of file diff --git a/src/api/integrations/chatbot/chatbot.controller.ts b/src/api/integrations/chatbot/chatbot.controller.ts index ea013cf5..2db9a654 100644 --- a/src/api/integrations/chatbot/chatbot.controller.ts +++ b/src/api/integrations/chatbot/chatbot.controller.ts @@ -108,7 +108,7 @@ export class ChatbotController { callback: any, ) { if (userMessageDebounce[remoteJid]) { - userMessageDebounce[remoteJid].message += ` ${content}`; + userMessageDebounce[remoteJid].message += `\n${content}`; this.logger.log('message debounced: ' + userMessageDebounce[remoteJid].message); clearTimeout(userMessageDebounce[remoteJid].timeoutId); } else { From 9fcb1e882951eb8d7d3e136d6d2c22ce4c2ab168 Mon Sep 17 00:00:00 2001 From: Junior Vidotti Date: Wed, 11 Sep 2024 22:00:23 +0000 Subject: [PATCH 2/4] reversed settings --- .vscode/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c9b35c82..36f854a3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { - // "editor.fontSize": 13, + "editor.fontSize": 13, "editor.fontLigatures": true, - // "editor.letterSpacing": 0.5, + "editor.letterSpacing": 0.5, "editor.smoothScrolling": true, "editor.tabSize": 2, "editor.codeActionsOnSave": { From c8b36a24017c491bd5497c2c2dcb4a44a56c601c Mon Sep 17 00:00:00 2001 From: Junior Vidotti Date: Wed, 11 Sep 2024 22:00:57 +0000 Subject: [PATCH 3/4] reversed settings --- .vscode/settings.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 36f854a3..8f568c69 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,6 +12,5 @@ "prisma-smart-formatter.prisma.defaultFormatter": "Prisma.prisma", "i18n-ally.localesPaths": [ "store/messages" - ], - "deno.enable": false + ] } \ No newline at end of file From 7fa41a4d4ce38b89903da17a0f523e9e97c3ba4b Mon Sep 17 00:00:00 2001 From: Junior Vidotti Date: Wed, 11 Sep 2024 22:18:30 +0000 Subject: [PATCH 4/4] removed docker-compose version as long it is obsolete --- CHANGELOG.md | 2 ++ docker-compose.dev.yaml | 3 +-- docker-compose.yaml | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2203bbd..5300afef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Define a global proxy to be used if the instance does not have one * Save is on whatsapp on the database * Add headers to the instance's webhook registration +* Debounce message break is now "\n" instead of white space ### Fixed @@ -16,6 +17,7 @@ * Use exchange name from .env on RabbitMQ * Fixed chatwoot screen * It is now possible to send images via the Evolution Channel +* Removed "version" from docker-compose as it is obsolete (https://dev.to/ajeetraina/do-we-still-use-version-in-compose-3inp) # 2.1.0 (2024-08-26 15:33) diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 9869fd57..2ca3424e 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -1,5 +1,3 @@ -version: '3.3' - services: api: container_name: evolution_api @@ -20,6 +18,7 @@ services: volumes: evolution_instances: + networks: evolution-net: name: evolution-net diff --git a/docker-compose.yaml b/docker-compose.yaml index 15963935..21dcf5d0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3.3' - services: api: container_name: evolution_api @@ -19,6 +17,7 @@ services: volumes: evolution_instances: + networks: evolution-net: name: evolution-net