From 19940953e2f13588abc8aa15a2898d50d37ebc61 Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Tue, 18 Jul 2023 11:21:55 -0300 Subject: [PATCH] fix: Fixed require fileName for document only in base64 for send media message --- CHANGELOG.md | 1 + src/whatsapp/controllers/sendMessage.controller.ts | 10 ++++++++-- src/whatsapp/services/whatsapp.service.ts | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9209058..613f0838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ * Fixed ghost mentions in send text message * Fixed bug that saved contacts from groups came without number in chatwoot * Fixed problem to receive csat in chatwoot +* Fixed require fileName for document only in base64 for send media message # 1.2.2 (2023-07-15 09:36) diff --git a/src/whatsapp/controllers/sendMessage.controller.ts b/src/whatsapp/controllers/sendMessage.controller.ts index e80cbfcf..fb942a9c 100644 --- a/src/whatsapp/controllers/sendMessage.controller.ts +++ b/src/whatsapp/controllers/sendMessage.controller.ts @@ -30,9 +30,15 @@ export class SendMessageController { public async sendMedia({ instanceName }: InstanceDto, data: SendMediaDto) { logger.verbose('requested sendMedia from ' + instanceName + ' instance'); - if (isBase64(data?.mediaMessage?.media) && !data?.mediaMessage?.fileName) { - throw new BadRequestException('For bse64 the file name must be informed.'); + + if ( + isBase64(data?.mediaMessage?.media) && + !data?.mediaMessage?.fileName && + data?.mediaMessage?.mediatype === 'document' + ) { + throw new BadRequestException('For base64 the file name must be informed.'); } + logger.verbose( 'isURL: ' + isURL(data?.mediaMessage?.media) + diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 3a0b5280..6cb85857 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -1361,7 +1361,6 @@ export class WAStartupService { } const formattedMXARNumber = this.formatMXOrARNumber(number); - console.log(formattedMXARNumber, number); if (formattedMXARNumber !== number) { this.logger.verbose( @@ -1870,6 +1869,8 @@ export class WAStartupService { this.logger.verbose('Sending media message'); const generate = await this.prepareMediaMessage(data.mediaMessage); + console.log('generate', generate); + return await this.sendMessageWithTyping( data.number, { ...generate.message },