From faed3f45746f181092fc9a745beea5744fdda2c7 Mon Sep 17 00:00:00 2001
From: Vitordotpy <v.program.py@gmail.com>
Date: Fri, 28 Nov 2025 16:32:06 -0300
Subject: [PATCH] fix: improve error handling for existing contacts and
 simplify remoteJid processing

---
 .../chatbot/chatwoot/services/chatwoot.service.ts      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts b/src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts
index f6580848..8d5b2dab 100644
--- a/src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts
+++ b/src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts
@@ -346,12 +346,8 @@ export class ChatwootService {
 
       return contact;
     } catch (error) {
-      if (
-        (error.status === 422 || error.response?.status === 422) &&
-        (error.message?.includes('taken') || error.response?.data?.message?.includes('taken')) &&
-        jid
-      ) {
-        this.logger.warn(`Contact with identifier ${jid} already exists, trying to find it...`);
+      if ((error.status === 422 || error.response?.status === 422) && jid) {
+        this.logger.warn(`Contact with identifier ${jid} creation failed (422). Checking if it already exists...`);
         const existingContact = await this.findContactByIdentifier(instance, jid);
         if (existingContact) {
           const contactId = existingContact.id;
@@ -2535,7 +2531,7 @@ export class ChatwootService {
     if (!remoteJid) {
       return '';
     }
-    return remoteJid.replace(/:\d+/, '').replace('@s.whatsapp.net', '').replace('@g.us', '').replace('@lid', '');
+    return remoteJid.replace(/:\d+/, '').split('@')[0];
   }
 
   public startImportHistoryMessages(instance: InstanceDto) {