From dd0c1e20a723b835407efbb3b96005de5a5a7680 Mon Sep 17 00:00:00 2001
From: CodePhix <contato@codephix.com>
Date: Tue, 25 Jul 2023 19:59:42 -0300
Subject: [PATCH 1/3] Update whatsapp.service.ts

---
 src/whatsapp/services/whatsapp.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
index ccefcfa0..bd07f951 100644
--- a/src/whatsapp/services/whatsapp.service.ts
+++ b/src/whatsapp/services/whatsapp.service.ts
@@ -1277,7 +1277,7 @@ export class WAStartupService {
         5: 'PLAYED',
       };
       for await (const { key, update } of args) {
-        if (settings.groups_ignore && key.remoteJid.includes('@g.us')) {
+        if (settings?.groups_ignore && key.remoteJid.includes('@g.us')) {
           this.logger.verbose('group ignored');
           return;
         }

From de0c9a1eff88aa1d22fad9ba9f8b8676caa4aa96 Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Wed, 26 Jul 2023 09:34:10 -0300
Subject: [PATCH 2/3] fix: fixed problems in localization template

---
 CHANGELOG.md                              |  6 ++++++
 src/whatsapp/services/chatwoot.service.ts | 15 ++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3a30ac7..88129b0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.4.5 (2023-07-26 09:32)
+
+### Fixed
+
+* Fixed problems in localization template
+
 # 1.4.4 (2023-07-25 15:24)
 
 ### Fixed
diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts
index 045c6519..90a0fa1a 100644
--- a/src/whatsapp/services/chatwoot.service.ts
+++ b/src/whatsapp/services/chatwoot.service.ts
@@ -240,7 +240,6 @@ export class ChatwootService {
         data['status'] = 'pending';
       }
 
-      console.log('this.provider', this.provider);
       const conversation = await client.conversations.create({
         accountId: this.provider.account_id,
         data,
@@ -1209,11 +1208,8 @@ export class ChatwootService {
       audioMessage: msg.audioMessage?.caption,
       contactMessage: msg.contactMessage?.vcard,
       contactsArrayMessage: msg.contactsArrayMessage,
-      locationMessage: msg.locationMessage
-        ? msg.locationMessage?.degreesLatitude +
-          ',' +
-          msg.locationMessage?.degreesLongitude
-        : undefined,
+      locationMessage: msg.locationMessage,
+      liveLocationMessage: msg.liveLocationMessage,
     };
 
     this.logger.verbose('type message: ' + types);
@@ -1227,8 +1223,9 @@ export class ChatwootService {
 
     const result = typeKey ? types[typeKey] : undefined;
 
-    if (typeKey === 'locationMessage') {
-      const [latitude, longitude] = result.split(',');
+    if (typeKey === 'locationMessage' || typeKey === 'liveLocationMessage') {
+      const latitude = result.degreesLatitude;
+      const longitude = result.degreesLongitude;
 
       const formattedLocation = `**Location:**
         **latitude:** ${latitude}
@@ -1311,7 +1308,7 @@ export class ChatwootService {
     this.logger.verbose('get conversation message');
 
     const types = this.getTypeMessage(msg);
-
+=
     const messageContent = this.getMessageContent(types);
 
     this.logger.verbose('conversation message: ' + messageContent);

From 3f41974a753285fd36fce7f0cdef3c4eb6cf044f Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Wed, 26 Jul 2023 09:38:22 -0300
Subject: [PATCH 3/3] fix: Fix mids going duplicated in chatwoot

---
 CHANGELOG.md                              | 3 ++-
 src/whatsapp/services/chatwoot.service.ts | 2 +-
 src/whatsapp/services/whatsapp.service.ts | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88129b0e..cf5498ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ### Fixed
 
-* Fixed problems in localization template
+* Fixed problems in localization template in chatwoot
+* Fix mids going duplicated in chatwoot
 
 # 1.4.4 (2023-07-25 15:24)
 
diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts
index 90a0fa1a..2d470c37 100644
--- a/src/whatsapp/services/chatwoot.service.ts
+++ b/src/whatsapp/services/chatwoot.service.ts
@@ -1308,7 +1308,7 @@ export class ChatwootService {
     this.logger.verbose('get conversation message');
 
     const types = this.getTypeMessage(msg);
-=
+
     const messageContent = this.getMessageContent(types);
 
     this.logger.verbose('conversation message: ' + messageContent);
diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
index bd07f951..4c9bf62d 100644
--- a/src/whatsapp/services/whatsapp.service.ts
+++ b/src/whatsapp/services/whatsapp.service.ts
@@ -1147,7 +1147,7 @@ export class WAStartupService {
 
       if (
         type !== 'notify' ||
-        // received.message?.protocolMessage ||
+        received.message?.protocolMessage ||
         received.message?.pollUpdateMessage
       ) {
         this.logger.verbose('message rejected');