Просмотр исходного кода

Revert "send notification like page update"

This reverts commit 293a3a0790970f163576ff125f2bb86f641ca6e1.
sou 7 лет назад
Родитель
Сommit
1c88b30554
3 измененных файлов с 26 добавлено и 20 удалено
  1. 4 9
      lib/routes/comment.js
  2. 22 0
      lib/routes/slack.js
  3. 0 11
      lib/util/slack.js

+ 4 - 9
lib/routes/comment.js

@@ -3,10 +3,9 @@ module.exports = function(crowi, app) {
 
   const debug = require('debug')('growi:routs:comment')
     , Comment = crowi.model('Comment')
-    , User = crowi.model('User')
     , Page = crowi.model('Page')
     , ApiResponse = require('../util/apiResponse')
-    , slack = require('../util/slack')
+    , slack = require('./slack')
     , actions = {}
     , api = {};
 
@@ -71,16 +70,12 @@ module.exports = function(crowi, app) {
       });
 
     // update page
-    const page = await Page.findOneAndUpdate({ _id: pageId }, {
+    await Page.findOneAndUpdate({ _id: pageId }, {
       lastUpdateUser: req.user,
       updatedAt: new Date()
     });
-
-    //slack notification
-    const slackNotify = new slack(crowi);
-    const user = await User.findUserByUsername(req.user.username);
-    await slackNotify.post(page, user, 'general', 'comment', null);
-
+    const s = new slack('adsf');
+    await s.send();
     return res.json(ApiResponse.success({comment: createdComment}));
   };
 

+ 22 - 0
lib/routes/slack.js

@@ -0,0 +1,22 @@
+module.exports = function(text) {
+  const slackFunc = {};
+  slackFunc.send = function(text) {
+    const Slack = require('slack-node');
+
+    const webhookUri = 'https://hooks.slack.com/services/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 ';
+
+    const slack = new Slack();
+    slack.setWebhook(webhookUri);
+
+    slack.webhook({
+      channel: '#general',
+      username: 'Growi',
+      text: '`comment uploaded`'
+    }, function(err, response) {
+      console.log(response);
+    });
+    console.log('i\'m in: text is: ', text);
+  };
+
+  return slackFunc;
+};

+ 0 - 11
lib/util/slack.js

@@ -80,14 +80,6 @@ module.exports = function(crowi) {
     return diffText;
   };
 
-  const prepareAttachmentTextForComment = function(page, user, channel, updateType, previousRevision) {
-    return {
-      channel: '#general',
-      username: 'Growi',
-      text: '`comment uploaded`'
-    };
-  };
-
   const prepareSlackMessage = function(page, user, channel, updateType, previousRevision) {
     var url = config.crowi['app:url'] || '';
     var body = page.revision.body;
@@ -95,9 +87,6 @@ module.exports = function(crowi) {
     if (updateType == 'create') {
       body = prepareAttachmentTextForCreate(page, user);
     }
-    else if (updateType == 'comment') {
-      body = prepareAttachmentTextForComment(page, user);
-    }
     else {
       body = prepareAttachmentTextForUpdate(page, user, previousRevision);
     }