From 872aa2a4182eeff29649cc998a8e7629406de07f Mon Sep 17 00:00:00 2001 From: joaosantanadev <82423306+joaosantanadev@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:01:52 -0300 Subject: [PATCH] Correction for global webhook --- .../integrations/event/webhook/webhook.controller.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/api/integrations/event/webhook/webhook.controller.ts b/src/api/integrations/event/webhook/webhook.controller.ts index 2fcf6c44..a3a5a99e 100644 --- a/src/api/integrations/event/webhook/webhook.controller.ts +++ b/src/api/integrations/event/webhook/webhook.controller.ts @@ -66,10 +66,8 @@ export class WebhookController extends EventController implements EventControlle local, }: EmitData): Promise { const instance = (await this.get(instanceName)) as wa.LocalWebHook; - - if (!instance || !instance?.enabled) { - return; - } + console.log(instanceName) + const webhookConfig = configService.get('WEBHOOK'); const webhookLocal = instance?.events; @@ -82,14 +80,14 @@ export class WebhookController extends EventController implements EventControlle event, instance: instanceName, data, - destination: instance?.url, + destination: instance?.url || `${webhookConfig.GLOBAL.URL}/${transformedWe}`, date_time: dateTime, sender, server_url: serverUrl, apikey: apiKey, }; - if (local) { + if (local && !instance || !instance?.enabled) { if (Array.isArray(webhookLocal) && webhookLocal.includes(we)) { let baseURL: string;