From 74308970854cab6bd24fea95b904ff70e084ba6a Mon Sep 17 00:00:00 2001 From: jaison-x Date: Mon, 25 Dec 2023 23:58:07 -0300 Subject: [PATCH 1/2] fix: when receiving a file from whatsapp, use the original filename in chatwoot when possible --- src/whatsapp/services/chatwoot.service.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index 26b0cce9..fab26a87 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -1561,8 +1561,15 @@ export class ChatwootService { }, }); - const random = Math.random().toString(36).substring(7); - const nameFile = `${random}.${mimeTypes.extension(downloadBase64.mimetype)}`; + let prependFilename: string; + if (body?.message[body?.messageType]?.fileName) { + prependFilename = `${path.parse(body.message[body.messageType].fileName).name}-${Math.floor( + Math.random() * (99 - 10 + 1) + 10, + )}`; + } else { + prependFilename = Math.random().toString(36).substring(7); + } + const nameFile = `${prependFilename}.${mimeTypes.extension(downloadBase64.mimetype)}`; const fileData = Buffer.from(downloadBase64.base64, 'base64'); From 49aa1ea17cd7f73828cb1679c62e97dcee8388f4 Mon Sep 17 00:00:00 2001 From: jaison-x Date: Tue, 26 Dec 2023 01:21:05 -0300 Subject: [PATCH 2/2] fix: when receiving a file from whatsapp, use the original filename in chatwoot when possible --- src/whatsapp/services/chatwoot.service.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index fab26a87..d91b27ba 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -1562,10 +1562,15 @@ export class ChatwootService { }); let prependFilename: string; - if (body?.message[body?.messageType]?.fileName) { - prependFilename = `${path.parse(body.message[body.messageType].fileName).name}-${Math.floor( - Math.random() * (99 - 10 + 1) + 10, - )}`; + if ( + body?.message[body?.messageType]?.fileName || + body?.message[body?.messageType]?.message?.documentMessage?.fileName + ) { + prependFilename = path.parse( + body?.message[body?.messageType]?.fileName || + body?.message[body?.messageType]?.message?.documentMessage?.fileName, + ).name; + prependFilename += `-${Math.floor(Math.random() * (99 - 10 + 1) + 10)}`; } else { prependFilename = Math.random().toString(36).substring(7); }