rename

src/server/crowi/index.js

@@ -57,7 +57,7 @@ function Crowi(rootdir) {
   this.syncPageStatusService = null;
   this.cdnResourcesService = new CdnResourcesService();
   this.interceptorManager = new InterceptorManager();
-  this.slackService = null;
+  this.slackBotService = null;
   this.xss = new Xss();
 
   this.tokens = null;
@@ -118,7 +118,7 @@ Crowi.prototype.init = async function() {
     this.setupImport(),
     this.setupPageService(),
     this.setupSyncPageStatusService(),
-    this.setupSlackService(),
+    this.setupSlackBotService(),
   ]);
 
   // globalNotification depends on slack and mailer
@@ -670,15 +670,15 @@ Crowi.prototype.setupSyncPageStatusService = async function() {
   }
 };
 
-Crowi.prototype.setupSlackService = async function() {
-  const SlackService = require('../service/slack');
-  if (this.slackService == null) {
-    this.slackService = new SlackService(this);
+Crowi.prototype.setupSlackBotService = async function() {
+  const SlackBotService = require('../service/slackbot');
+  if (this.slackBotService == null) {
+    this.slackBotService = new SlackBotService(this);
   }
 
   // add as a message handler
   if (this.s2sMessagingService != null) {
-    this.s2sMessagingService.addMessageHandler(this.slackService);
+    this.s2sMessagingService.addMessageHandler(this.slackBotService);
   }
 };
 

src/server/routes/apiv3/slack-bot.js

@@ -44,13 +44,13 @@ module.exports = (crowi) => {
 
     switch (command) {
       case 'search':
-        await crowi.slackService.showEphemeralSearchResults(body, args);
+        await crowi.slackBotService.showEphemeralSearchResults(body, args);
         break;
       case 'create':
-        await crowi.slackService.createModal(body);
+        await crowi.slackBotService.createModal(body);
         break;
       default:
-        await crowi.slackService.notCommand(body);
+        await crowi.slackBotService.notCommand(body);
         break;
     }
 
@@ -61,7 +61,7 @@ module.exports = (crowi) => {
 
     switch (actionId) {
       case 'shareSearchResults': {
-        await crowi.slackService.shareSearchResults(payload);
+        await crowi.slackBotService.shareSearchResults(payload);
         break;
       }
       case 'showNextResults': {
@@ -69,7 +69,7 @@ module.exports = (crowi) => {
 
         const { body, args, offset } = parsedValue;
         const newOffset = offset + 10;
-        await crowi.slackService.showEphemeralSearchResults(body, args, newOffset);
+        await crowi.slackBotService.showEphemeralSearchResults(body, args, newOffset);
         break;
       }
       default:
@@ -82,7 +82,7 @@ module.exports = (crowi) => {
 
     switch (callbackId) {
       case 'createPage':
-        await crowi.slackService.createPageInGrowi(payload);
+        await crowi.slackBotService.createPageInGrowi(payload);
         break;
       default:
         break;

src/server/service/slack.js → src/server/service/slackbot.js

@@ -1,4 +1,4 @@
-const logger = require('@alias/logger')('growi:service:SlackService');
+const logger = require('@alias/logger')('growi:service:SlackBotService');
 const mongoose = require('mongoose');
 
 const PAGINGLIMIT = 10;
@@ -8,7 +8,7 @@ const { WebClient, LogLevel } = require('@slack/web-api');
 const S2sMessage = require('../models/vo/s2s-message');
 const S2sMessageHandlable = require('./s2s-messaging/handlable');
 
-class SlackService extends S2sMessageHandlable {
+class SlackBotService extends S2sMessageHandlable {
 
   constructor(crowi) {
     super();
@@ -44,7 +44,7 @@ class SlackService extends S2sMessageHandlable {
    */
   shouldHandleS2sMessage(s2sMessage) {
     const { eventName, updatedAt } = s2sMessage;
-    if (eventName !== 'slackServiceUpdated' || updatedAt == null) {
+    if (eventName !== 'slackBotServiceUpdated' || updatedAt == null) {
       return false;
     }
 
@@ -67,7 +67,7 @@ class SlackService extends S2sMessageHandlable {
     const { s2sMessagingService } = this;
 
     if (s2sMessagingService != null) {
-      const s2sMessage = new S2sMessage('slackServiceUpdated', { updatedAt: new Date() });
+      const s2sMessage = new S2sMessage('slackBotServiceUpdated', { updatedAt: new Date() });
 
       try {
         await s2sMessagingService.publish(s2sMessage);
@@ -358,4 +358,4 @@ class SlackService extends S2sMessageHandlable {
 
 }
 
-module.exports = SlackService;
+module.exports = SlackBotService;