Merge pull request #1736 from juniortopanotti/main

remove lógica de paginação duplicada no fetchChats que causa resultados vazios quando skip > 0
Merge pull request #1732 from rafwell/testmsg
2025-12-27 15:47:45 -06:00 · 2025-07-21 13:16:22 -03:00 · 2025-07-21 13:15:38 -03:00 · 2025-07-21 13:15:17 -03:00 · 2025-07-21 13:14:33 -03:00 · 2025-07-18 14:20:22 -03:00
5 changed files with 89 additions and 47 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,6 +26,7 @@
        "cors": "^2.8.5",
        "dayjs": "^1.11.13",
        "dotenv": "^16.4.7",
+        "emoji-regex": "^10.4.0",
        "eventemitter2": "^6.4.9",
        "express": "^4.21.2",
        "express-async-errors": "^3.1.1",
@@ -6140,9 +6141,10 @@
      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
    },
    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "license": "MIT"
    },
    "node_modules/encodeurl": {
      "version": "2.0.0",
@@ -11098,6 +11100,18 @@
        "node": ">=8"
      }
    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
+    "node_modules/string-width/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
    "node_modules/string.prototype.trim": {
      "version": "1.2.10",
      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
    "cors": "^2.8.5",
    "dayjs": "^1.11.13",
    "dotenv": "^16.4.7",
+    "emoji-regex": "^10.4.0",
    "eventemitter2": "^6.4.9",
    "express": "^4.21.2",
    "express-async-errors": "^3.1.1",
--- a/src/api/controllers/sendMessage.controller.ts
+++ b/src/api/controllers/sendMessage.controller.ts
@@ -17,13 +17,15 @@ import {
 import { WAMonitoringService } from '@api/services/monitor.service';
 import { BadRequestException } from '@exceptions';
 import { isBase64, isURL } from 'class-validator';
+import emojiRegex from 'emoji-regex';
+
+const regex = emojiRegex();

 function isEmoji(str: string) {
  if (str === '') return true;

-  const emojiRegex =
-    /^[\u{1F300}-\u{1F9FF}\u{2600}-\u{26FF}\u{2700}-\u{27BF}\u{1F000}-\u{1F02F}\u{1F0A0}-\u{1F0FF}\u{1F100}-\u{1F64F}\u{1F680}-\u{1F6FF}]$/u;
-  return emojiRegex.test(str);
+  const match = str.match(regex);
+  return match?.length === 1 && match[0] === str;
 }

 export class SendMessageController {
--- a/src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts
+++ b/src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts
@@ -567,6 +567,13 @@ export class ChatwootService {
  }

  public async createConversation(instance: InstanceDto, body: any) {
+    if (!body?.key) {
+      this.logger.warn(
+        `body.key is null or undefined in createConversation. Full body object: ${JSON.stringify(body)}`,
+      );
+      return null;
+    }
+
    const isLid = body.key.previousRemoteJid?.includes('@lid') && body.key.senderPn;
    const remoteJid = body.key.remoteJid;
    const cacheKey = `${instance.instanceName}:createConversation-${remoteJid}`;
@@ -1893,6 +1900,12 @@ export class ChatwootService {

  public async eventWhatsapp(event: string, instance: InstanceDto, body: any) {
    try {
+      // Ignore events that are not messages (like EPHEMERAL_SYNC_RESPONSE)
+      if (body?.type && body.type !== 'message' && body.type !== 'conversation') {
+        this.logger.verbose(`Ignoring non-message event type: ${body.type}`);
+        return;
+      }
+
      const waInstance = this.waMonitor.waInstances[instance.instanceName];

      if (!waInstance) {
@@ -1938,6 +1951,11 @@ export class ChatwootService {
      }

      if (event === 'messages.upsert' || event === 'send.message') {
+        if (!body?.key) {
+          this.logger.warn(`body.key is null or undefined. Full body object: ${JSON.stringify(body)}`);
+          return;
+        }
+
        if (body.key.remoteJid === 'status@broadcast') {
          return;
        }
@@ -2260,10 +2278,23 @@ export class ChatwootService {
      }

      if (event === 'messages.edit' || event === 'send.message.update') {
+        // Ignore events that are not messages (like EPHEMERAL_SYNC_RESPONSE)
+        if (body?.type && body.type !== 'message') {
+          this.logger.verbose(`Ignoring non-message event type: ${body.type}`);
+          return;
+        }
+
+        if (!body?.key?.id) {
+          this.logger.warn(
+            `body.key.id is null or undefined in messages.edit. Full body object: ${JSON.stringify(body)}`,
+          );
+          return;
+        }
+
        const editedText = `${
          body?.editedMessage?.conversation || body?.editedMessage?.extendedTextMessage?.text
        }\n\n_\`${i18next.t('cw.message.edited')}.\`_`;
-        const message = await this.getMessageByKeyId(instance, body?.key?.id);
+        const message = await this.getMessageByKeyId(instance, body.key.id);
        const key = message.key as {
          id: string;
          fromMe: boolean;
--- a/src/api/services/channel.service.ts
+++ b/src/api/services/channel.service.ts
@@ -740,21 +740,21 @@ export class ChannelStartupService {
          "Chat"."createdAt" + INTERVAL '24 hours' as "windowExpires",
          "Chat"."unreadMessages" as "unreadMessages",
          CASE WHEN "Chat"."createdAt" + INTERVAL '24 hours' > NOW() THEN true ELSE false END as "windowActive",
-          "Message"."id" AS lastMessageId,
-          "Message"."key" AS lastMessage_key,
+          "Message"."id" AS "lastMessageId",
+          "Message"."key" AS "lastMessage_key",
          CASE
            WHEN "Message"."key"->>'fromMe' = 'true' THEN 'Você'
            ELSE "Message"."pushName"
-          END AS lastMessagePushName,
-          "Message"."participant" AS lastMessageParticipant,
-          "Message"."messageType" AS lastMessageMessageType,
-          "Message"."message" AS lastMessageMessage,
-          "Message"."contextInfo" AS lastMessageContextInfo,
-          "Message"."source" AS lastMessageSource,
-          "Message"."messageTimestamp" AS lastMessageMessageTimestamp,
-          "Message"."instanceId" AS lastMessageInstanceId,
-          "Message"."sessionId" AS lastMessageSessionId,
-          "Message"."status" AS lastMessageStatus
+          END AS "lastMessagePushName",
+          "Message"."participant" AS "lastMessageParticipant",
+          "Message"."messageType" AS "lastMessageMessageType",
+          "Message"."message" AS "lastMessageMessage",
+          "Message"."contextInfo" AS "lastMessageContextInfo",
+          "Message"."source" AS "lastMessageSource",
+          "Message"."messageTimestamp" AS "lastMessageMessageTimestamp",
+          "Message"."instanceId" AS "lastMessageInstanceId",
+          "Message"."sessionId" AS "lastMessageSessionId",
+          "Message"."status" AS "lastMessageStatus"
        FROM "Message"
        LEFT JOIN "Contact" ON "Contact"."remoteJid" = "Message"."key"->>'remoteJid' AND "Contact"."instanceId" = "Message"."instanceId"
        LEFT JOIN "Chat" ON "Chat"."remoteJid" = "Message"."key"->>'remoteJid' AND "Chat"."instanceId" = "Message"."instanceId"
@@ -771,44 +771,38 @@ export class ChannelStartupService {

    if (results && isArray(results) && results.length > 0) {
      const mappedResults = results.map((contact) => {
-        const lastMessage = contact.lastmessageid
+        const lastMessage = contact.lastMessageId
          ? {
-              id: contact.lastmessageid,
-              key: contact.lastmessage_key,
-              pushName: contact.lastmessagepushname,
-              participant: contact.lastmessageparticipant,
-              messageType: contact.lastmessagemessagetype,
-              message: contact.lastmessagemessage,
-              contextInfo: contact.lastmessagecontextinfo,
-              source: contact.lastmessagesource,
-              messageTimestamp: contact.lastmessagemessagetimestamp,
-              instanceId: contact.lastmessageinstanceid,
-              sessionId: contact.lastmessagesessionid,
-              status: contact.lastmessagestatus,
+              id: contact.lastMessageId,
+              key: contact.lastMessage_key,
+              pushName: contact.lastMessagePushName,
+              participant: contact.lastMessageParticipant,
+              messageType: contact.lastMessageMessageType,
+              message: contact.lastMessageMessage,
+              contextInfo: contact.lastMessageContextInfo,
+              source: contact.lastMessageSource,
+              messageTimestamp: contact.lastMessageMessageTimestamp,
+              instanceId: contact.lastMessageInstanceId,
+              sessionId: contact.lastMessageSessionId,
+              status: contact.lastMessageStatus,
            }
          : undefined;

        return {
-          id: contact.contactid || null,
-          remoteJid: contact.remotejid,
-          pushName: contact.pushname,
-          profilePicUrl: contact.profilepicurl,
-          updatedAt: contact.updatedat,
-          windowStart: contact.windowstart,
-          windowExpires: contact.windowexpires,
-          windowActive: contact.windowactive,
+          id: contact.contactId || null,
+          remoteJid: contact.remoteJid,
+          pushName: contact.pushName,
+          profilePicUrl: contact.profilePicUrl,
+          updatedAt: contact.updatedAt,
+          windowStart: contact.windowStart,
+          windowExpires: contact.windowExpires,
+          windowActive: contact.windowActive,
          lastMessage: lastMessage ? this.cleanMessageData(lastMessage) : undefined,
          unreadCount: contact.unreadMessages,
-          isSaved: !!contact.contactid,
+          isSaved: !!contact.contactId,
        };
      });

-      if (query?.take && query?.skip) {
-        const skip = query.skip || 0;
-        const take = query.take || 20;
-        return mappedResults.slice(skip, skip + take);
-      }
-
      return mappedResults;
    }
Author	SHA1	Message	Date
Davidson Gomes	b98cd11fb1	Merge pull request #1736 from juniortopanotti/main Some checks are pending Build Docker image / Build and Deploy (push) Waiting to run Details remove lógica de paginação duplicada no fetchChats que causa resultados vazios quando skip > 0	2025-07-21 13:16:22 -03:00
Davidson Gomes	5386d7171b	Merge pull request #1732 from rafwell/testmsg Ignore events that are not messages (like EPHEMERAL_SYNC_RESPONSE)	2025-07-21 13:15:38 -03:00
Davidson Gomes	f59cae7ee2	Merge pull request #1729 from ricaelchiquetti/main improv: Ajustado isEmoji para aceitar todos os emojis.	2025-07-21 13:15:17 -03:00
Davidson Gomes	0e358cf9c1	Merge pull request #1696 from foqc/foqc/develop Preserve alias casing in chat fetch query	2025-07-21 13:14:33 -03:00
Gilberto Topanotti Junior	6954472070	remove lógica de paginação duplicada no fetchChats que causa resultados vazios quando skip > 0 Problema: O método fetchChats estava aplicando a lógica de paginação duas vezes, causando resultados vazios ao usar o parâmetro skip com valores maiores que 0. Causa Raiz: A query SQL já aplica LIMIT e OFFSET corretamente O código JavaScript então aplica .slice(skip, skip + take) nos resultados já paginados Este "offset duplo" faz com que o slice tente acessar posições do array que não existem Exemplo do bug: Requisição: {"take": 10, "skip": 10} SQL: LIMIT 10 OFFSET 10 → retorna chats 11-20 (10 itens) JS: .slice(10, 20) → tenta pegar posições 10-20 de um array com apenas 10 itens Resultado: [] (array vazio) Solução: Removida a lógica de paginação JavaScript redundante (linhas 796-800) já que a query SQL já manipula a paginação corretamente com LIMIT e OFFSET. Arquivos Alterados: src/api/services/channel.service.ts Testes: ✅ {"take": 10, "skip": 0} - Retorna os primeiros 10 chats ✅ {"take": 10, "skip": 10} - Retorna chats 11-20 (anteriormente retornava []) ✅ {"take": 5, "skip": 15} - Retorna chats 16-20 (anteriormente retornava []) Impacto: Corrige a funcionalidade de paginação para todos os valores de skip > 0 Mantém compatibilidade com versões anteriores Sem mudanças que quebrem implementações existentes	2025-07-18 14:20:22 -03:00
Rafael Souza	afd0e01ddb	fix lint	2025-07-17 15:59:33 -03:00
Rafael Souza	b3dae7a68e	Ignore events that are not messages	2025-07-17 15:40:31 -03:00
Rafael Souza	44d4781f6f	Ignore events that are not messages	2025-07-17 15:37:37 -03:00
Rafael Souza	e304b1dcdf	Fix erro key	2025-07-17 15:32:25 -03:00
Rafael Souza	f8f2153cb4	Fix erro key	2025-07-17 15:29:04 -03:00
ricael	85798b209c	improv: remover o emojiRefex() da função isEmoji.	2025-07-17 09:43:52 -03:00
ricael	71ebecbed3	improv: ajustado a validação aceitar todos os emojis.	2025-07-17 09:17:06 -03:00
foqc	1ca829c00b	feature: run lint to clean up codebase	2025-07-15 16:40:17 -05:00
Davidson Gomes	5d0278a589	Merge branch 'develop' into foqc/develop	2025-07-14 14:46:36 -03:00
foqc	85936dcaed	feature: Correctly map SQL query results by enforcing quoted column aliases (update missing mappings)	2025-07-07 17:40:30 -05:00
foqc	333ef3eeb8	feature: Correctly map SQL query results by enforcing quoted column aliases	2025-07-07 17:31:49 -05:00