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: adjusts in returns in endpoints chatwoot and webhook

Browse Source
This commit is contained in:
Davidson Gomes 2023-07-17 11:33:08 -03:00
parent 69353892d9
commit 8a14141021
3 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/whatsapp/controllers/chatwoot.controller.ts
View File

@ -66,6 +66,18 @@ export class ChatwootController {
const urlServer = this.configService.get<HttpServer>('SERVER').URL; const urlServer = this.configService.get<HttpServer>('SERVER').URL;
if (Object.keys(result).length === 0) {
return {
enabled: false,
url: '',
account_id: '',
token: '',
sign_msg: false,
name_inbox: '',
webhook_url: '',
};
}
const response = { const response = {
...result, ...result,
webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`, webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`,

12
src/whatsapp/services/webhook.service.ts
View File

@ -18,9 +18,17 @@ export class WebhookService {
public async find(instance: InstanceDto): Promise<WebhookDto> { public async find(instance: InstanceDto): Promise<WebhookDto> {
try { try {
this.logger.verbose('find webhook: ' + instance.instanceName); this.logger.verbose('find webhook: ' + instance.instanceName);
return await this.waMonitor.waInstances[instance.instanceName].findWebhook(); const result = await this.waMonitor.waInstances[
instance.instanceName
].findWebhook();
if (Object.keys(result).length === 0) {
throw new Error('Webhook not found');
}
return result;
} catch (error) { } catch (error) {
return { enabled: null, url: '' }; return { enabled: false, url: '', events: [], webhook_by_events: false };
} }
} }
} }

28
src/whatsapp/services/whatsapp.service.ts
View File

@ -1334,29 +1334,27 @@ export class WAStartupService {
private createJid(number: string): string { private createJid(number: string): string {
this.logger.verbose('Creating jid with number: ' + number); this.logger.verbose('Creating jid with number: ' + number);
const numberReplace = number.replace(/[^0-9]/g, ''); if (number.includes('@g.us') || number.includes('@s.whatsapp.net')) {
if (numberReplace.includes('@g.us') || numberReplace.includes('@s.whatsapp.net')) {
this.logger.verbose('Number already contains @g.us or @s.whatsapp.net'); this.logger.verbose('Number already contains @g.us or @s.whatsapp.net');
return numberReplace; return number;
} }
if (numberReplace.includes('@broadcast')) { if (number.includes('@broadcast')) {
this.logger.verbose('Number already contains @broadcast'); this.logger.verbose('Number already contains @broadcast');
return numberReplace; return number;
} }
const formattedBRNumber = this.formatBRNumber(numberReplace); const formattedBRNumber = this.formatBRNumber(number);
if (formattedBRNumber !== numberReplace) { if (formattedBRNumber !== number) {
this.logger.verbose( this.logger.verbose(
'Jid created is whatsapp in format BR: ' + `${formattedBRNumber}@s.whatsapp.net`, 'Jid created is whatsapp in format BR: ' + `${formattedBRNumber}@s.whatsapp.net`,
); );
return `${formattedBRNumber}@s.whatsapp.net`; return `${formattedBRNumber}@s.whatsapp.net`;
} }
const formattedMXARNumber = this.formatMXOrARNumber(numberReplace); const formattedMXARNumber = this.formatMXOrARNumber(number);
if (formattedMXARNumber !== numberReplace) { if (formattedMXARNumber !== number) {
this.logger.verbose( this.logger.verbose(
'Jid created is whatsapp in format MXAR: ' + 'Jid created is whatsapp in format MXAR: ' +
`${formattedMXARNumber}@s.whatsapp.net`, `${formattedMXARNumber}@s.whatsapp.net`,
@ -1364,13 +1362,13 @@ export class WAStartupService {
return `${formattedMXARNumber}@s.whatsapp.net`; return `${formattedMXARNumber}@s.whatsapp.net`;
} }
if (numberReplace.includes('-')) { if (number.includes('-')) {
this.logger.verbose('Jid created is group: ' + `${numberReplace}@g.us`); this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
return `${numberReplace}@g.us`; return `${number}@g.us`;
} }
this.logger.verbose('Jid created is whatsapp: ' + `${numberReplace}@s.whatsapp.net`); this.logger.verbose('Jid created is whatsapp: ' + `${number}@s.whatsapp.net`);
return `${numberReplace}@s.whatsapp.net`; return `${number}@s.whatsapp.net`;
} }
public async profilePicture(number: string) { public async profilePicture(number: string) {