fix: get message id for typebot

EvolutionAPI · Jun 10, 2024 · a8937bd · a8937bd
1 parent fa3306b
commit a8937bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/api/integrations/typebot/services/typebot.service.ts b/src/api/integrations/typebot/services/typebot.service.ts
@@ -719,10 +719,13 @@ export class TypebotService {
       listResponseMessage: msg?.message?.listResponseMessage?.singleSelectReply?.selectedRowId,
       responseRowId: msg?.message?.listResponseMessage?.singleSelectReply?.selectedRowId,
       // Medias
-      audioMessage: `audioMessage:${msg?.key?.id}`,
-      imageMessage: `imageMessage:${msg?.key?.id}`,
-      videoMessage: `videoMessage:${msg?.key?.id}`,
-      documentMessage: `documentMessage:${msg?.key?.id}`,
+      audioMessage: msg?.message?.audioMessage ? `audioMessage:${msg?.key?.id}` : undefined,
+      imageMessage: msg?.message?.imageMessage ? `imageMessage:${msg?.key?.id}` : undefined,
+      videoMessage: msg?.message?.videoMessage ? `videoMessage:${msg?.key?.id}` : undefined,
+      documentMessage: msg?.message?.documentMessage ? `documentMessage:${msg?.key?.id}` : undefined,
+      documentWithCaptionMessage: msg?.message?.auddocumentWithCaptionMessageioMessage
+        ? `documentWithCaptionMessage:${msg?.key?.id}`
+        : undefined,
     };
 
     const messageType = Object.keys(types).find((key) => types[key] !== undefined) || 'unknown';

diff --git a/src/api/services/channels/whatsapp.baileys.service.ts b/src/api/services/channels/whatsapp.baileys.service.ts
@@ -1173,6 +1173,10 @@ export class BaileysStartupService extends ChannelStartupService {
 
           this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
 
+          await this.prismaRepository.message.create({
+            data: messageRaw,
+          });
+
           if (
             this.configService.get<Chatwoot>('CHATWOOT').ENABLED &&
             this.localChatwoot.enabled &&
@@ -1202,10 +1206,6 @@ export class BaileysStartupService extends ChannelStartupService {
             }
           }
 
-          await this.prismaRepository.message.create({
-            data: messageRaw,
-          });
-
           const contact = await this.prismaRepository.contact.findFirst({
             where: { remoteJid: received.key.remoteJid, instanceId: this.instanceId },
           });