Przeglądaj źródła

abolish isIncomingWebhookPrioritized

mizozobu 6 lat temu
rodzic
commit
8372122ed7
2 zmienionych plików z 1 dodań i 8 usunięć
  1. 0 7
      src/server/models/config.js
  2. 1 1
      src/server/util/slack.js

+ 0 - 7
src/server/models/config.js

@@ -388,13 +388,6 @@ module.exports = function(crowi) {
     }
     }
   };
   };
 
 
-  configSchema.statics.isIncomingWebhookPrioritized = function(config) {
-    if (!config.notification) {
-      return false;
-    }
-    return (!!config.notification['slack:isIncomingWebhookPrioritized']);
-  };
-
   configSchema.statics.getLocalconfig = function() { // CONF.RF: これも別のメソッドにする
   configSchema.statics.getLocalconfig = function() { // CONF.RF: これも別のメソッドにする
     const env = process.env;
     const env = process.env;
 
 

+ 1 - 1
src/server/util/slack.js

@@ -206,7 +206,7 @@ module.exports = function(crowi) {
 
 
   const slackPost = (messageObj) => {
   const slackPost = (messageObj) => {
     // when incoming Webhooks is prioritized
     // when incoming Webhooks is prioritized
-    if (Config.isIncomingWebhookPrioritized(config)) {
+    if (configManager.getConfig('notification', 'slack:isIncomingWebhookPrioritized')) {
       if (configManager.getConfig('notification', 'slack:incomingWebhookUrl')) {
       if (configManager.getConfig('notification', 'slack:incomingWebhookUrl')) {
         debug('posting message with IncomingWebhook');
         debug('posting message with IncomingWebhook');
         return postWithIwh(messageObj);
         return postWithIwh(messageObj);