NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-14 01:41:24 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Correction in chatwoot text formatting and render list message

Browse Source
This commit is contained in:
Davidson Gomes 2023-12-29 19:10:59 -03:00
parent 5bd3f28117
commit 2dcd4d8fd3
4 changed files with 2058 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@
* Correction in sending lists
* Adjust in webhook_base64
* Correction in typebot text formatting
* Correction in chatwoot text formatting and render list message
# 1.6.1 (2023-12-22 11:43)

1968
src/whatsapp/services/chatwoot.service copy.ts Normal file
View File

File diff suppressed because it is too large Load Diff

104
src/whatsapp/services/chatwoot.service.ts
View File

@ -1332,6 +1332,8 @@ export class ChatwootService {
contactsArrayMessage: msg.contactsArrayMessage,
locationMessage: msg.locationMessage,
liveLocationMessage: msg.liveLocationMessage,
listMessage: msg.listMessage,
listResponseMessage: msg.listResponseMessage,
};
this.logger.verbose('type message: ' + types);
@ -1349,11 +1351,27 @@ export class ChatwootService {
const latitude = result.degreesLatitude;
const longitude = result.degreesLongitude;
const formattedLocation = `**Location:**
**latitude:** ${latitude}
**longitude:** ${longitude}
https://www.google.com/maps/search/?api=1&query=${latitude},${longitude}
`;
const locationName = result?.name || 'Unknown';
const locationAddress = result?.address || 'Unknown';
const formattedLocation =
'*Localização:*\n\n' +
'_Latitude:_ ' +
latitude +
'\n' +
'_Longitude:_ ' +
longitude +
'\n' +
'_Nome:_ ' +
locationName +
'\n' +
'_Endereço:_ ' +
locationAddress +
'\n' +
'_Url:_ https://www.google.com/maps/search/?api=1&query=' +
latitude +
',' +
longitude;
this.logger.verbose('message content: ' + formattedLocation);
@ -1371,19 +1389,17 @@ export class ChatwootService {
}
});
let formattedContact = `**Contact:**
**name:** ${contactInfo['FN']}`;
let formattedContact = '*Contact:*\n\n' + '_Name:_ ' + contactInfo['FN'];
let numberCount = 1;
Object.keys(contactInfo).forEach((key) => {
if (key.startsWith('item') && key.includes('TEL')) {
const phoneNumber = contactInfo[key];
formattedContact += `\n**number ${numberCount}:** ${phoneNumber}`;
formattedContact += '\n_Number (' + numberCount + '):_ ' + phoneNumber;
numberCount++;
}
if (key.includes('TEL')) {
} else if (key.includes('TEL')) {
const phoneNumber = contactInfo[key];
formattedContact += `\n**number:** ${phoneNumber}`;
formattedContact += '\n_Number (' + numberCount + '):_ ' + phoneNumber;
numberCount++;
}
});
@ -1404,19 +1420,17 @@ export class ChatwootService {
}
});
let formattedContact = `**Contact:**
**name:** ${contact.displayName}`;
let formattedContact = '*Contact:*\n\n' + '_Name:_ ' + contact.displayName;
let numberCount = 1;
Object.keys(contactInfo).forEach((key) => {
if (key.startsWith('item') && key.includes('TEL')) {
const phoneNumber = contactInfo[key];
formattedContact += `\n**number ${numberCount}:** ${phoneNumber}`;
formattedContact += '\n_Number (' + numberCount + '):_ ' + phoneNumber;
numberCount++;
}
if (key.includes('TEL')) {
} else if (key.includes('TEL')) {
const phoneNumber = contactInfo[key];
formattedContact += `\n**number:** ${phoneNumber}`;
formattedContact += '\n_Number (' + numberCount + '):_ ' + phoneNumber;
numberCount++;
}
});
@ -1431,6 +1445,62 @@ export class ChatwootService {
return formattedContactsArray;
}
if (typeKey === 'listMessage') {
const listTitle = result?.title || 'Unknown';
const listDescription = result?.description || 'Unknown';
const listFooter = result?.footerText || 'Unknown';
let formattedList =
'*List Menu:*\n\n' +
'_Title_: ' +
listTitle +
'\n' +
'_Description_: ' +
listDescription +
'\n' +
'_Footer_: ' +
listFooter;
if (result.sections && result.sections.length > 0) {
result.sections.forEach((section, sectionIndex) => {
formattedList += '\n\n*Section ' + (sectionIndex + 1) + ':* ' + section.title || 'Unknown\n';
if (section.rows && section.rows.length > 0) {
section.rows.forEach((row, rowIndex) => {
formattedList += '\n*Line ' + (rowIndex + 1) + ':*\n';
formattedList += '_▪️ Title:_ ' + (row.title || 'Unknown') + '\n';
formattedList += '_▪️ Description:_ ' + (row.description || 'Unknown') + '\n';
formattedList += '_▪️ ID:_ ' + (row.rowId || 'Unknown') + '\n';
});
} else {
formattedList += '\nNo lines found in this section.\n';
}
});
} else {
formattedList += '\nNo sections found.\n';
}
return formattedList;
}
if (typeKey === 'listResponseMessage') {
const responseTitle = result?.title || 'Unknown';
const responseDescription = result?.description || 'Unknown';
const responseRowId = result?.singleSelectReply?.selectedRowId || 'Unknown';
const formattedResponseList =
'*List Response:*\n\n' +
'_Title_: ' +
responseTitle +
'\n' +
'_Description_: ' +
responseDescription +
'\n' +
'_ID_: ' +
responseRowId;
return formattedResponseList;
}
this.logger.verbose('message content: ' + result);
return result;

5
src/whatsapp/services/typebot.service.ts
View File

@ -412,7 +412,7 @@ export class TypebotService {
text += element.text;
}
if (element.type === 'p' || element.type === 'inline-variable') {
if (element.type === 'p' || element.type === 'inline-variable' || element.type === 'a') {
for (const child of element.children) {
text += applyFormatting(child);
}
@ -435,8 +435,7 @@ export class TypebotService {
let formattedText = `${formats}${text}${formats.split('').reverse().join('')}`;
if (element.url) {
const linkText = element.children[0]?.text || '';
formattedText = `[${linkText}](${element.url})`;
formattedText = element.children[0]?.text ? `[${formattedText}]\n(${element.url})` : `${element.url}`;
}
return formattedText;