mirror of
https://github.com/EvolutionAPI/evolution-api.git
synced 2025-12-18 19:32:21 -06:00
fix:
- [Baileys] Trocar @lids em remoteJid por senderPn em todos os serviços; - [Baileys] Adicionar valor @lid recebido em remoteJid para previousRemoteJid (Posteriormente utilizasse em ChatwootService); - Minors fixes;
This commit is contained in:
@@ -26,7 +26,7 @@ import axios from 'axios';
|
||||
import { proto } from 'baileys';
|
||||
import dayjs from 'dayjs';
|
||||
import FormData from 'form-data';
|
||||
import Jimp from 'jimp';
|
||||
import { Jimp, JimpMime } from 'jimp';
|
||||
import Long from 'long';
|
||||
import mimeTypes from 'mime-types';
|
||||
import path from 'path';
|
||||
@@ -567,7 +567,7 @@ export class ChatwootService {
|
||||
}
|
||||
|
||||
public async createConversation(instance: InstanceDto, body: any) {
|
||||
const isLid = body.key.remoteJid.includes('@lid') && body.key.senderPn;
|
||||
const isLid = body.key.previousRemoteJid?.includes('@lid') && body.key.senderPn;
|
||||
const remoteJid = isLid ? body.key.senderPn : body.key.remoteJid;
|
||||
const cacheKey = `${instance.instanceName}:createConversation-${remoteJid}`;
|
||||
const lockKey = `${instance.instanceName}:lock:createConversation-${remoteJid}`;
|
||||
@@ -575,7 +575,11 @@ export class ChatwootService {
|
||||
|
||||
try {
|
||||
// Processa atualização de contatos já criados @lid
|
||||
if (body.key.remoteJid.includes('@lid') && body.key.senderPn && body.key.senderPn !== body.key.remoteJid) {
|
||||
if (
|
||||
body.key.previousRemoteJid?.includes('@lid') &&
|
||||
body.key.senderPn &&
|
||||
body.key.senderPn !== body.key.previousRemoteJid
|
||||
) {
|
||||
const contact = await this.findContact(instance, body.key.remoteJid.split('@')[0]);
|
||||
if (contact && contact.identifier !== body.key.senderPn) {
|
||||
this.logger.verbose(
|
||||
@@ -713,7 +717,6 @@ export class ChatwootService {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const jid = isLid && body?.key?.senderPn ? body.key.senderPn : body.key.remoteJid;
|
||||
contact = await this.createContact(
|
||||
instance,
|
||||
chatId,
|
||||
@@ -721,7 +724,7 @@ export class ChatwootService {
|
||||
isGroup,
|
||||
nameContact,
|
||||
picture_url.profilePictureUrl || null,
|
||||
jid,
|
||||
remoteJid,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -2129,9 +2132,11 @@ export class ChatwootService {
|
||||
const fileData = Buffer.from(imgBuffer.data, 'binary');
|
||||
|
||||
const img = await Jimp.read(fileData);
|
||||
await img.cover(320, 180);
|
||||
|
||||
const processedBuffer = await img.getBufferAsync(Jimp.MIME_PNG);
|
||||
await img.cover({
|
||||
w: 320,
|
||||
h: 180,
|
||||
});
|
||||
const processedBuffer = await img.getBuffer(JimpMime.png);
|
||||
|
||||
const fileStream = new Readable();
|
||||
fileStream._read = () => {}; // _read is required but you can noop it
|
||||
|
||||
Reference in New Issue
Block a user