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

Revert "customized notification"

This reverts commit d80f23208d9d1ebacc33cb27028b66e72ce87d91.
sou 7 лет назад
Родитель
Сommit
839b11c77d
2 измененных файлов с 4 добавлено и 18 удалено
  1. 1 1
      lib/routes/comment.js
  2. 3 17
      lib/util/slack.js

+ 1 - 1
lib/routes/comment.js

@@ -79,7 +79,7 @@ module.exports = function(crowi, app) {
     //slack notification
     const slackNotify = new slack(crowi);
     const user = await User.findUserByUsername(req.user.username);
-    await slackNotify.post(page, user, 'general', 'comment', null, createdComment);
+    await slackNotify.post(page, user, 'general', 'comment', null);
 
     return res.json(ApiResponse.success({comment: createdComment}));
   };

+ 3 - 17
lib/util/slack.js

@@ -88,7 +88,7 @@ module.exports = function(crowi) {
     };
   };
 
-  const prepareSlackMessage = function(page, user, channel, updateType, previousRevision, comment) {
+  const prepareSlackMessage = function(page, user, channel, updateType, previousRevision) {
     var url = config.crowi['app:url'] || '';
     var body = page.revision.body;
 
@@ -112,20 +112,6 @@ module.exports = function(crowi) {
       text: body,
       mrkdwn_in: ['text'],
     };
-
-    if (updateType == 'comment') {
-      attachment = {
-        color: '#263a3c',
-        author_name: '@' + user.username,
-        author_link: url + '/user/' + user.username,
-        author_icon: user.image,
-        title: comment.comment,
-        title_link: url + '/' + page._id,
-        text: body,
-        mrkdwn_in: ['text'],
-      };
-    }
-
     if (user.image) {
       attachment.author_icon = user.image;
     }
@@ -159,8 +145,8 @@ module.exports = function(crowi) {
   };
 
   // slack.post = function (channel, message, opts) {
-  slack.post = (page, user, channel, updateType, previousRevision, comment) => {
-    const messageObj = prepareSlackMessage(page, user, channel, updateType, previousRevision, comment);
+  slack.post = (page, user, channel, updateType, previousRevision) => {
+    const messageObj = prepareSlackMessage(page, user, channel, updateType, previousRevision);
 
     return new Promise((resolve, reject) => {
       // define callback function for Promise