Merge branch 'develop' of github.com:EvolutionAPI/evolution-api into develop

This commit is contained in:
Davidson Gomes 2023-12-29 19:11:28 -03:00
commit 8f8c7e26c7

View File

@ -893,17 +893,21 @@ export class ChatwootService {
try { try {
this.logger.verbose('get media type'); this.logger.verbose('get media type');
const parts = media.split('/'); const parsedMedia = path.parse(decodeURIComponent(media));
let mimeType = mimeTypes.lookup(parsedMedia?.ext) || '';
let fileName = parsedMedia?.name + parsedMedia?.ext;
const fileName = decodeURIComponent(parts[parts.length - 1]); if (!mimeType) {
this.logger.verbose('file name: ' + fileName); const parts = media.split('/');
fileName = decodeURIComponent(parts[parts.length - 1]);
this.logger.verbose('file name: ' + fileName);
const response = await axios.get(media, { const response = await axios.get(media, {
responseType: 'arraybuffer', responseType: 'arraybuffer',
}); });
mimeType = response.headers['content-type'];
const mimeType = response.headers['content-type']; this.logger.verbose('mime type: ' + mimeType);
this.logger.verbose('mime type: ' + mimeType); }
let type = 'document'; let type = 'document';
@ -1597,20 +1601,21 @@ export class ChatwootService {
}, },
}); });
let prependFilename: string; let nameFile: string;
if ( const messageBody = body?.message[body?.messageType];
body?.message[body?.messageType]?.fileName || const originalFilename = messageBody?.fileName || messageBody?.message?.documentMessage?.fileName;
body?.message[body?.messageType]?.message?.documentMessage?.fileName if (originalFilename) {
) { const parsedFile = path.parse(originalFilename);
prependFilename = path.parse( if (parsedFile.name && parsedFile.ext) {
body?.message[body?.messageType]?.fileName || nameFile = `${parsedFile.name}-${Math.floor(Math.random() * (99 - 10 + 1) + 10)}${parsedFile.ext}`;
body?.message[body?.messageType]?.message?.documentMessage?.fileName, }
).name; }
prependFilename += `-${Math.floor(Math.random() * (99 - 10 + 1) + 10)}`;
} else { if (!nameFile) {
prependFilename = Math.random().toString(36).substring(7); nameFile = `${Math.random().toString(36).substring(7)}.${
mimeTypes.extension(downloadBase64.mimetype) || ''
}`;
} }
const nameFile = `${prependFilename}.${mimeTypes.extension(downloadBase64.mimetype)}`;
const fileData = Buffer.from(downloadBase64.base64, 'base64'); const fileData = Buffer.from(downloadBase64.base64, 'base64');