From 44a88fc597c87c000dadf2cf33fb3440bd271b3d Mon Sep 17 00:00:00 2001 From: Francis Breit Date: Mon, 2 Oct 2023 09:02:21 -0300 Subject: [PATCH] Update whatsapp.service.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit correçao de sintaxe --- src/whatsapp/services/whatsapp.service.ts | 41 +++++++++++------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 12696c0d..1c48edae 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -2308,37 +2308,36 @@ export class WAStartupService { mediaMessage.fileName = arrayMatch[1]; this.logger.verbose('File name: ' + mediaMessage.fileName); } - // *inserido francis inicio - let mimetype: string; - // *inserido francis final - if (mediaMessage.mediatype === 'image' && !mediaMessage.fileName) { - mediaMessage.fileName = 'image.png'; - // inserido francis inicio - mimetype = 'image/png'; - // inserido francis inicio - + mediaMessage.fileName = 'image.png'; } if (mediaMessage.mediatype === 'video' && !mediaMessage.fileName) { mediaMessage.fileName = 'video.mp4'; - // inserido francis inicio - mimetype = 'video/mp4'; - // inserido francis final } - // ocultado francis inicio - // let mimetype: string; + + let mimetype: string; + // novo critério para adotar mimetype quando nao está presente na url e no filename - inicio + if (isURL(mediaMessage.media) || mediaMessage.fileName) { + if (isURL(mediaMessage.media)) { + mimetype = getMIMEType(mediaMessage.media); + } else { + mimetype = getMIMEType(mediaMessage.fileName); + } + } else { + if (mediaMessage.mediatype === 'image') { + mimetype = 'image/png'; + } + if (mediaMessage.mediatype === 'video') { + mimetype = 'video/mp4'; + } + } - // if (isURL(mediaMessage.media)) { - // mimetype = getMIMEType(mediaMessage.media); - // } else { - // mimetype = getMIMEType(mediaMessage.fileName); - // } - // ocultado francis final - + // novo critério para adotar mimetype quando nao está presente na url e no filename - fim + this.logger.verbose('Mimetype: ' + mimetype); prepareMedia[mediaType].caption = mediaMessage?.caption;