Главная Обзор Помощь
Вход
wiki
/
weseek__growi
зеркало из https://github.com/weseek/growi
2
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Merge branch 'feat/growi-bot' into fix/bug-not-delete-setting-if-mistaked-proxy-url

zahmis 4 лет назад
Родитель
861e379f21 0715076e8c
Сommit
4525ff1b90
8 измененных файлов с 78 добавлено и 25 удалено
Единый вид Показать статистику Diff
  1. 15 0
      packages/slackbot-proxy/src/Server.ts
  2. 1 1
      packages/slackbot-proxy/src/controllers/privacy.ts
  3. 0 21
      packages/slackbot-proxy/src/controllers/slack.ts
  4. 35 0
      packages/slackbot-proxy/src/controllers/top.ts
  5. BIN
      packages/slackbot-proxy/src/public/images/growi-bot.png
  6. 20 0
      packages/slackbot-proxy/src/views/top.ejs
  7. 3 1
      src/server/routes/apiv3/slack-integration.js
  8. 4 2
      src/server/service/slackbot.js

+ 15 - 0
packages/slackbot-proxy/src/Server.ts
Просмотреть файл 

@@ -88,6 +88,21 @@ const helmetOptions = isProduction ? {} : {
 
   exclude: [
 
   exclude: [
 
     '**/*.spec.ts',
 
     '**/*.spec.ts',
 
   ],
 
   ],
 
+  viewsDir: `${rootDir}/views`,
 
+  views: {
 
+    root: `${rootDir}/views`,
 
+    viewEngine: 'ejs',
 
+    extensions: {
 
+      ejs: 'ejs',
 
+    },
 
+  },
 
+  statics: {
 
+    '/': [
 
+      {
 
+        root: `${rootDir}/public`,
 
+      },
 
+    ],
 
+  },
 
 })
 
 })
 
 export class Server {
 
 export class Server {

+ 1 - 1
packages/slackbot-proxy/src/controllers/privacy.ts
Просмотреть файл 

@@ -4,7 +4,7 @@ import { Request, Response } from 'express';
 
 const isOfficialMode = process.env.OFFICIAL_MODE === 'true';
 
 const isOfficialMode = process.env.OFFICIAL_MODE === 'true';
 
 
 
 @Controller('/privacy')
 
 @Controller('/privacy')
 
-export class SlackCtrl {
 
+export class PrivacyCtrl {
 
 
 
   constructor(router: PlatformRouter) {
 
   constructor(router: PlatformRouter) {
 
     if (isOfficialMode) {
 
     if (isOfficialMode) {

+ 0 - 21
packages/slackbot-proxy/src/controllers/slack.ts
Просмотреть файл 

@@ -53,27 +53,6 @@ export class SlackCtrl {
 
   @Inject()
 
   @Inject()
 
   unregisterService: UnregisterService;
 
   unregisterService: UnregisterService;
 
 
 
-  @Get('/install')
 
-  async install(): Promise<string> {
 
-    const url = await this.installerService.installer.generateInstallUrl({
 
-      // Add the scopes your app needs
 
-      scopes: [
 
-        'channels:history',
 
-        'commands',
 
-        'groups:history',
 
-        'im:history',
 
-        'mpim:history',
 
-        'chat:write',
 
-        'team:read',
 
-      ],
 
-    });
 
-
 
-    return `<a href="${url}">`
 
-      // eslint-disable-next-line max-len
 
-      + '<img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcSet="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x" />'
 
-      + '</a>';
 
-  }
 
-
 
   /**
 
   /**
 
    * Send command to specified GROWIs
 
    * Send command to specified GROWIs
 
    * @param growiCommand
 
    * @param growiCommand

+ 35 - 0
packages/slackbot-proxy/src/controllers/top.ts
Просмотреть файл 

@@ -0,0 +1,35 @@
 
+import {
 
+  Controller, Get, Inject, View,
 
+} from '@tsed/common';
 
+
 
+import { InstallerService } from '~/services/InstallerService';
 
+
 
+const isOfficialMode = process.env.OFFICIAL_MODE === 'true';
 
+
 
+
 
+@Controller('/')
 
+export class TopCtrl {
 
+
 
+  @Inject()
 
+  installerService: InstallerService;
 
+
 
+  @Get('/')
 
+  @View('top.ejs')
 
+  async getTopPage(): Promise<any> {
 
+    const url = await this.installerService.installer.generateInstallUrl({
 
+      // Add the scopes your app needs
 
+      scopes: [
 
+        'channels:history',
 
+        'commands',
 
+        'groups:history',
 
+        'im:history',
 
+        'mpim:history',
 
+        'chat:write',
 
+        'team:read',
 
+      ],
 
+    });
 
+
 
+    return { url, isOfficialMode };
 
+  }
 
+
 
+}

BIN
packages/slackbot-proxy/src/public/images/growi-bot.png
Просмотреть файл


+ 20 - 0
packages/slackbot-proxy/src/views/top.ejs
Просмотреть файл 

@@ -0,0 +1,20 @@
 
+<head>
 
+  <meta name="viewport" content="width=device-width,initial-scale=1">
 
+</head>
 
+
 
+<body style="padding-top:100px; text-align:center;">
 
+  <h1 >GROWI Bot</h1>
 
+  <div>
 
+    <img height="300" width="300" alt="GROWi Bot" src="/images/growi-bot.png" />
 
+  </div>
 
+  <div style="display:flex; justify-content: space-around; max-width: 500px; margin:30px auto;">
 
+    <a href=<%- url %>>
 
+      <img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcSet="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x" />
 
+    </a>
 
+    <% if (isOfficialMode) { %>
 
+      <a href="/privacy">
 
+        Privacy Policy
 
+      </a>
 
+    <% } %>
 
+  </div>
 
+</body>

+ 3 - 1
src/server/routes/apiv3/slack-integration.js
Просмотреть файл 

@@ -33,7 +33,9 @@ module.exports = (crowi) => {
 
 
 
     if (slackAppIntegrationCount === 0) {
 
     if (slackAppIntegrationCount === 0) {
 
       return res.status(403).send({
 
       return res.status(403).send({
 
-        message: 'The access token that identifies the request source is slackbot-proxy is invalid. Did you setup with `/growi register`?',
 
+        message: 'The access token that identifies the request source is slackbot-proxy is invalid. Did you setup with `/growi register`.\n'
 
+        + 'Or did you delete registration for GROWI ? if so, the link with GROWI has been disconnected. '
 
+        + 'Please unregister the information registered in the proxy and setup `/growi register` again.',
 
       });
 
       });
 
     }
 
     }

+ 4 - 2
src/server/service/slackbot.js
Просмотреть файл 

@@ -171,10 +171,11 @@ class SlackBotService extends S2sMessageHandlable {
 
       return;
 
       return;
 
     }
 
     }
 
 
 
-    const base = this.crowi.appService.getSiteUrl();
 
+    const appUrl = this.crowi.appService.getSiteUrl();
 
+    const appTitle = this.crowi.appService.getAppTitle();
 
 
 
     const urls = resultPaths.map((path) => {
 
     const urls = resultPaths.map((path) => {
 
-      const url = new URL(path, base);
 
+      const url = new URL(path, appUrl);
 
       return `<${decodeURI(url.href)} | ${decodeURI(url.pathname)}>`;
 
       return `<${decodeURI(url.href)} | ${decodeURI(url.pathname)}>`;
 
     });
 
     });
 
 
 
@@ -235,6 +236,7 @@ class SlackBotService extends S2sMessageHandlable {
 
         user: body.user_id,
 
         user: body.user_id,
 
         text: 'Successed To Search',
 
         text: 'Successed To Search',
 
         blocks: [
 
         blocks: [
 
+          this.generateMarkdownSectionBlock(`<${decodeURI(appUrl)}|*${appTitle}*>`),
 
           this.generateMarkdownSectionBlock(keywordsAndDesc),
 
           this.generateMarkdownSectionBlock(keywordsAndDesc),
 
           this.generateMarkdownSectionBlock(`${urls.join('\n')}`),
 
           this.generateMarkdownSectionBlock(`${urls.join('\n')}`),
 
           actionBlocks,
 
           actionBlocks,