From 3893e01af9258965b72d030265450c7250685b39 Mon Sep 17 00:00:00 2001 From: Francis Breit Date: Tue, 26 Sep 2023 13:27:58 -0300 Subject: [PATCH 1/3] Corrigir nao recebimento de midias minio/s3 Update whatsapp.service.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correção nao recebimento de midias com urls do minio/s3 . Urls sem o nome da extensão da midia impediam o envio das mensagens por erro na detecção do mimetype. --- src/whatsapp/services/whatsapp.service.ts | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 4575b682..48aab481 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -2311,19 +2311,29 @@ export class WAStartupService { if (mediaMessage.mediatype === 'image' && !mediaMessage.fileName) { mediaMessage.fileName = 'image.png'; + // inserido francis inicio + mimetype = 'image/png'; + // inserido francis inicio + } if (mediaMessage.mediatype === 'video' && !mediaMessage.fileName) { mediaMessage.fileName = 'video.mp4'; + // inserido francis inicio + mimetype = 'video/mp4'; + // inserido francis final } let mimetype: string; - if (isURL(mediaMessage.media)) { - mimetype = getMIMEType(mediaMessage.media); - } else { - mimetype = getMIMEType(mediaMessage.fileName); - } + // ocultado francis inicio + + // if (isURL(mediaMessage.media)) { + // mimetype = getMIMEType(mediaMessage.media); + // } else { + // mimetype = getMIMEType(mediaMessage.fileName); + // } + // ocultado francis final this.logger.verbose('Mimetype: ' + mimetype); From 916972aeb1a51c1e7031a8755593843e47533b89 Mon Sep 17 00:00:00 2001 From: Francis Breit Date: Tue, 26 Sep 2023 13:52:11 -0300 Subject: [PATCH 2/3] Update whatsapp.service.ts --- src/whatsapp/services/whatsapp.service.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 48aab481..0d035b6c 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -2308,6 +2308,9 @@ 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'; @@ -2324,9 +2327,9 @@ export class WAStartupService { // inserido francis final } - let mimetype: string; + // ocultado francis inicio + // let mimetype: string; - // ocultado francis inicio // if (isURL(mediaMessage.media)) { // mimetype = getMIMEType(mediaMessage.media); From b648334323e4870afebd2e3c24c182dac8529e6e Mon Sep 17 00:00:00 2001 From: Francis Breit Date: Tue, 26 Sep 2023 14:15:50 -0300 Subject: [PATCH 3/3] Corrigir nao recebimento de midias minio/s3 - finalizado- Update whatsapp.service.tsUpdate whatsapp.service.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correção nao recebimento de midias com urls do minio/s3 . Urls sem o nome da extensão da midia impediam o envio das mensagens por erro na detecção do mimetype. Imagem e Video --- src/whatsapp/services/whatsapp.service.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 0d035b6c..12696c0d 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -2308,9 +2308,10 @@ export class WAStartupService { mediaMessage.fileName = arrayMatch[1]; this.logger.verbose('File name: ' + mediaMessage.fileName); } - // inserido francis inicio + // *inserido francis inicio let mimetype: string; - // inserido francis final + // *inserido francis final + if (mediaMessage.mediatype === 'image' && !mediaMessage.fileName) { mediaMessage.fileName = 'image.png';