set condition global-notification-slack

src/server/service/global-notification/global-notification-slack.js

@@ -31,9 +31,21 @@ class GlobalNotificationSlackService {
     const messageBody = this.generateMessageBody(event, path, triggeredBy, vars);
     const attachmentBody = this.generateAttachmentBody(event, path, triggeredBy, vars);
 
-    await Promise.all(notifications.map((notification) => {
-      return this.slackLegacy.sendGlobalNotification(messageBody, attachmentBody, notification.slackChannels);
-    }));
+    if (this.crowi.configManager.getConfig('notification', 'slack:isIncomingWebhookPrioritized')) {
+      await Promise.all(notifications.map((notification) => {
+        return this.slackLegacy.sendGlobalNotification(messageBody, attachmentBody, notification.slackChannels);
+      }));
+    }
+    else if (this.crowi.configManager.getConfig('crowi', 'slackbot:token')) {
+      await Promise.all(notifications.map((notification) => {
+        return this.slack.sendGlobalNotification(messageBody, attachmentBody, notification.slackChannels);
+      }));
+    }
+    else {
+      await Promise.all(notifications.map((notification) => {
+        return this.slackLegacy.sendGlobalNotification(messageBody, attachmentBody, notification.slackChannels);
+      }));
+    }
   }
 
   /**

src/server/util/slack.js

@@ -218,21 +218,7 @@ module.exports = function(crowi) {
   };
 
   const slackPost = (messageObj) => {
-    console.log('hoge');
-    // when incoming Webhooks is prioritized
-    if (configManager.getConfig('notification', 'slack:isIncomingWebhookPrioritized')) {
-      // if (configManager.getConfig('notification', 'slack:incomingWebhookUrl')) {
-      //   debug('posting message with IncomingWebhook');
-      //   return postWithIwh(messageObj);
-      // }
-      if (configManager.getConfig('crowi', 'slackbot:token')) {
-        return postWithSlackBot(messageObj);
-      }
-    }
-    // else
-    else if (configManager.getConfig('crowi', 'slackbot:token')) {
-      return postWithSlackBot(messageObj);
-    }
+    return postWithSlackBot(messageObj);
   };
 
   return slack;