mirror of
https://github.com/EvolutionAPI/evolution-api.git
synced 2025-07-14 09:51:24 -06:00
added source_id in media messages
This commit is contained in:
parent
7289c3d7f9
commit
bd0a479645
@ -43,7 +43,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@adiwajshing/keyed-db": "^0.2.4",
|
"@adiwajshing/keyed-db": "^0.2.4",
|
||||||
"@ffmpeg-installer/ffmpeg": "^1.1.0",
|
"@ffmpeg-installer/ffmpeg": "^1.1.0",
|
||||||
"@figuro/chatwoot-sdk": "github:raimartinsb/chatwoot-sdk",
|
"@figuro/chatwoot-sdk": "^1.1.16",
|
||||||
"@hapi/boom": "^10.0.1",
|
"@hapi/boom": "^10.0.1",
|
||||||
"@sentry/node": "^7.59.2",
|
"@sentry/node": "^7.59.2",
|
||||||
"@whiskeysockets/baileys": "github:EvolutionAPI/Baileys",
|
"@whiskeysockets/baileys": "github:EvolutionAPI/Baileys",
|
||||||
|
@ -732,6 +732,8 @@ export class ChatwootService {
|
|||||||
file: string,
|
file: string,
|
||||||
messageType: 'incoming' | 'outgoing' | undefined,
|
messageType: 'incoming' | 'outgoing' | undefined,
|
||||||
content?: string,
|
content?: string,
|
||||||
|
source_id?: string,
|
||||||
|
source_reply_id?: string,
|
||||||
) {
|
) {
|
||||||
this.logger.verbose('send data to chatwoot');
|
this.logger.verbose('send data to chatwoot');
|
||||||
|
|
||||||
@ -748,6 +750,12 @@ export class ChatwootService {
|
|||||||
this.logger.verbose('temp file found');
|
this.logger.verbose('temp file found');
|
||||||
data.append('attachments[]', createReadStream(file));
|
data.append('attachments[]', createReadStream(file));
|
||||||
|
|
||||||
|
this.logger.verbose('message context: ' + source_id);
|
||||||
|
data.append('source_id', source_id);
|
||||||
|
|
||||||
|
this.logger.verbose('message reply context: ' + source_reply_id);
|
||||||
|
data.append('source_reply_id', source_reply_id);
|
||||||
|
|
||||||
this.logger.verbose('get client to instance: ' + this.provider.instanceName);
|
this.logger.verbose('get client to instance: ' + this.provider.instanceName);
|
||||||
const config = {
|
const config = {
|
||||||
method: 'post',
|
method: 'post',
|
||||||
@ -1170,10 +1178,10 @@ export class ChatwootService {
|
|||||||
documentMessage: msg.documentMessage?.contextInfo?.stanzaId,
|
documentMessage: msg.documentMessage?.contextInfo?.stanzaId,
|
||||||
documentWithCaptionMessage: msg.documentWithCaptionMessage?.message?.documentMessage?.contextInfo?.stanzaId,
|
documentWithCaptionMessage: msg.documentWithCaptionMessage?.message?.documentMessage?.contextInfo?.stanzaId,
|
||||||
audioMessage: msg.audioMessage?.contextInfo?.stanzaId,
|
audioMessage: msg.audioMessage?.contextInfo?.stanzaId,
|
||||||
contactMessage: msg.contactMessage?.vcard,
|
contactMessage: msg.contactMessage?.contextInfo?.stanzaId,
|
||||||
contactsArrayMessage: msg.contactsArrayMessage,
|
contactsArrayMessage: msg.contactsArrayMessage?.contextInfo?.stanzaId,
|
||||||
locationMessage: msg.locationMessage,
|
locationMessage: msg.locationMessage?.contextInfo?.stanzaId,
|
||||||
liveLocationMessage: msg.liveLocationMessage,
|
liveLocationMessage: msg.liveLocationMessage?.contextInfo?.stanzaId,
|
||||||
};
|
};
|
||||||
|
|
||||||
this.logger.verbose('type message: ' + types);
|
this.logger.verbose('type message: ' + types);
|
||||||
@ -1182,7 +1190,7 @@ export class ChatwootService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private getContextMessageContent(types: any) {
|
private getContextMessageContent(types: any) {
|
||||||
this.logger.verbose('get message content');
|
this.logger.verbose('get message context content');
|
||||||
const typeKey = Object.keys(types).find((key) => types[key] !== undefined);
|
const typeKey = Object.keys(types).find((key) => types[key] !== undefined);
|
||||||
|
|
||||||
const result = typeKey ? types[typeKey] : undefined;
|
const result = typeKey ? types[typeKey] : undefined;
|
||||||
@ -1393,7 +1401,7 @@ export class ChatwootService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.logger.verbose('send data to chatwoot');
|
this.logger.verbose('send data to chatwoot');
|
||||||
const send = await this.sendData(getConversion, fileName, messageType, content);
|
const send = await this.sendData(getConversion, fileName, messageType, content, source_id, source_reply_id);
|
||||||
|
|
||||||
if (!send) {
|
if (!send) {
|
||||||
this.logger.warn('message not sent');
|
this.logger.warn('message not sent');
|
||||||
@ -1414,7 +1422,14 @@ export class ChatwootService {
|
|||||||
this.logger.verbose('message is not group');
|
this.logger.verbose('message is not group');
|
||||||
|
|
||||||
this.logger.verbose('send data to chatwoot');
|
this.logger.verbose('send data to chatwoot');
|
||||||
const send = await this.sendData(getConversion, fileName, messageType, bodyMessage);
|
const send = await this.sendData(
|
||||||
|
getConversion,
|
||||||
|
fileName,
|
||||||
|
messageType,
|
||||||
|
bodyMessage,
|
||||||
|
source_id,
|
||||||
|
source_reply_id,
|
||||||
|
);
|
||||||
|
|
||||||
if (!send) {
|
if (!send) {
|
||||||
this.logger.warn('message not sent');
|
this.logger.warn('message not sent');
|
||||||
|
Loading…
Reference in New Issue
Block a user