3 files changed, 22 insertions, 8 deletions
diff --git a/models/activities.js b/models/activities.js
index 3ecd5c8c..f64fce10 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -184,10 +184,11 @@ if (Meteor.isServer) {
               // it's person at himself, ignore it?
               continue;
             }
-            const user = Users.findOne(username) || Users.findOne({ username });
-            const uid = user && user._id;
+            const atUser =
+              Users.findOne(username) || Users.findOne({ username });
+            const uid = atUser && atUser._id;
             params.atUsername = username;
-            params.atEmails = user.emails;
+            params.atEmails = atUser.emails;
             if (board.hasMember(uid)) {
               title = 'act-atUserComment';
               watchers = _.union(watchers, [uid]);
@@ -268,13 +269,23 @@ if (Meteor.isServer) {
     });
 
     const integrations = Integrations.find({
-      boardId: board._id,
-      type: 'outgoing-webhooks',
+      boardId: { $in: [board._id, Integrations.Const.GLOBAL_WEBHOOK_ID] },
+      // type: 'outgoing-webhooks', // all types
       enabled: true,
       activities: { $in: [description, 'all'] },
     }).fetch();
     if (integrations.length > 0) {
-      Meteor.call('outgoingWebhooks', integrations, description, params);
+      integrations.forEach(integration => {
+        Meteor.call(
+          'outgoingWebhooks',
+          integration,
+          description,
+          params,
+          () => {
+            return;
+          },
+        );
+      });
     }
   });
 }
diff --git a/models/integrations.js b/models/integrations.js
index 0313c959..ce843680 100644
--- a/models/integrations.js
+++ b/models/integrations.js
@@ -90,7 +90,11 @@ Integrations.attachSchema(
 );
 Integrations.Const = {
   GLOBAL_WEBHOOK_ID: '_global',
-  WEBHOOK_TYPES: ['outgoing-webhooks', 'bidirectional-webhooks'],
+  ONEWAY: 'outgoing-webhooks',
+  TWOWAY: 'bidirectional-webhooks',
+  get WEBHOOK_TYPES() {
+    return [this.ONEWAY, this.TWOWAY];
+  },
 };
 const permissionHelper = {
   allow(userId, doc) {
diff --git a/models/settings.js b/models/settings.js
index 80c2d8e0..4a0359d5 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -147,7 +147,6 @@ if (Meteor.isServer) {
         }:${doc.mailServer.port}/`;
       }
       Accounts.emailTemplates.from = doc.mailServer.from;
-      console.log('Settings saved:', Accounts.emailTemplates);
     }
   });