🐍 bug fix: webhook events

rsuppersahabatan · Jan 6, 2024 · f30cb9d · f30cb9d
1 parent 5e9f180
commit f30cb9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts
@@ -80,6 +80,7 @@ export class InstanceController {
       throw new InternalServerErrorException(error?.message);
     }
   }
+
   public async reloadConnection({ instanceName }: InstanceDto) {
     try {
       const instance = this.waMonitor.waInstances[instanceName];

diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
@@ -252,7 +252,10 @@ export class WAStartupService {
     const eventDesc = WebhookEventsEnum[event];
 
     try {
-      if (this.webhook?.enabled && isURL(this.webhook?.url)) {
+      if (
+        this.webhook?.enabled &&
+        isURL(this.webhook?.url, { protocols: ['http', 'https'] })
+      ) {
         if (this.webhook?.events && this.webhook?.events[event]) {
           await axios.post(
             this.webhook.url,
@@ -263,7 +266,8 @@ export class WAStartupService {
             },
             { headers: { 'Resource-Owner': this.instance.ownerJid } },
           );
-        } else {
+        }
+        if (!this.webhook?.events) {
           await axios.post(
             this.webhook.url,
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,7 @@ export class InstanceController { @@
           throw new InternalServerErrorException(error?.message);
         }
       }
       public async reloadConnection({ instanceName }: InstanceDto) {
         try {
           const instance = this.waMonitor.waInstances[instanceName];
@@ Expand Down @@