Yuki Takei 3 лет назад
Родитель
Сommit
c008ee0827

+ 2 - 2
apps/app/src/components/Admin/SlackIntegration/BotTypeCard.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import { useTranslation } from 'next-i18next';
 
 import { SlackbotType } from '@growi/slack';
+import { useTranslation } from 'next-i18next';
+import PropTypes from 'prop-types';
 
 const botDetails = {
   officialBot: {

+ 4 - 3
apps/app/src/server/models/slack-app-integration.js

@@ -1,6 +1,7 @@
-const crypto = require('crypto');
-const mongoose = require('mongoose');
-const { defaultSupportedSlackEventActions } = require('@growi/slack');
+import crypto from 'crypto';
+
+import { defaultSupportedSlackEventActions } from '@growi/slack';
+import mongoose from 'mongoose';
 
 
 const schema = new mongoose.Schema({

+ 2 - 1
apps/app/src/server/models/vo/slack-command-handler-error.ts

@@ -1,4 +1,5 @@
-import { type RespondBodyForResponseUrl, markdownSectionBlock } from '@growi/slack';
+import type { RespondBodyForResponseUrl } from '@growi/slack';
+import { markdownSectionBlock } from '@growi/slack/dist/utils/block-kit-builder';
 import ExtensibleCustomError from 'extensible-custom-error';
 
 export const generateDefaultRespondBodyForInternalServerError = (message: string): RespondBodyForResponseUrl => {

+ 8 - 8
apps/app/src/server/routes/apiv3/slack-integration-settings.js

@@ -1,4 +1,12 @@
 import { ErrorV3 } from '@growi/core';
+import {
+  SlackbotType, REQUEST_TIMEOUT_FOR_GTOP,
+  defaultSupportedSlackEventActions, defaultSupportedCommandsNameForBroadcastUse, defaultSupportedCommandsNameForSingleUse,
+} from '@growi/slack';
+import {
+  getConnectionStatus, getConnectionStatuses,
+  sendSuccessMessage,
+} from '@growi/slack/dist/utils/check-communicable';
 
 import { SupportedAction } from '~/interfaces/activity';
 import loggerFactory from '~/utils/logger';
@@ -6,15 +14,7 @@ import loggerFactory from '~/utils/logger';
 import { generateAddActivityMiddleware } from '../../middlewares/add-activity';
 import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
 
-import { SlackbotType, defaultSupportedSlackEventActions } from '@growi/slack';
-
 
-const {
-  getConnectionStatus, getConnectionStatuses,
-  sendSuccessMessage,
-  defaultSupportedCommandsNameForBroadcastUse, defaultSupportedCommandsNameForSingleUse,
-  REQUEST_TIMEOUT_FOR_GTOP,
-} = require('@growi/slack');
 const axios = require('axios');
 const express = require('express');
 const { body, query, param } = require('express-validator');

+ 7 - 7
apps/app/src/server/routes/apiv3/slack-integration.js

@@ -1,17 +1,17 @@
 import { ErrorV3 } from '@growi/core';
+import { supportedGrowiCommands } from '@growi/slack';
+import { verifySlackRequest } from '@growi/slack/dist/middlewares';
+import { InvalidGrowiCommandError } from '@growi/slack/dist/models/errors';
+import { markdownSectionBlock } from '@growi/slack/dist/utils/block-kit-builder';
+import { InteractionPayloadAccessor } from '@growi/slack/dist/utils/interaction-payload-accessor';
+import { generateRespondUtil } from '@growi/slack/dist/utils/respond-util-factory';
+import { parseSlashCommand } from '@growi/slack/dist/utils/slash-command-parser';
 import createError from 'http-errors';
 
 import { SlackCommandHandlerError } from '~/server/models/vo/slack-command-handler-error';
 import loggerFactory from '~/utils/logger';
 
-import {
-  markdownSectionBlock, InvalidGrowiCommandError, generateRespondUtil, supportedGrowiCommands,
-} from '@growi/slack';
 
-
-const {
-  verifySlackRequest, parseSlashCommand, InteractionPayloadAccessor, respond,
-} = require('@growi/slack');
 const express = require('express');
 const { body } = require('express-validator');
 const mongoose = require('mongoose');

+ 3 - 1
apps/app/src/server/service/slack-command-handler/create-page-service.js

@@ -1,8 +1,10 @@
+import { markdownSectionBlock } from '@growi/slack/dist/utils/block-kit-builder';
+import { reshapeContentsBody } from '@growi/slack/dist/utils/reshape-contents-body';
+
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:service:CreatePageService');
 const { pathUtils } = require('@growi/core');
-const { reshapeContentsBody, markdownSectionBlock } = require('@growi/slack');
 const mongoose = require('mongoose');
 
 class CreatePageService {

+ 3 - 1
apps/app/src/server/service/slack-command-handler/error-handler.ts

@@ -1,6 +1,8 @@
 import assert from 'assert';
 
-import { respond, type RespondBodyForResponseUrl, markdownSectionBlock } from '@growi/slack';
+import type { RespondBodyForResponseUrl } from '@growi/slack';
+import { markdownSectionBlock } from '@growi/slack/dist/utils/block-kit-builder';
+import { respond } from '@growi/slack/dist/utils/response-url';
 import { type ChatPostEphemeralResponse, WebClient } from '@slack/web-api';
 
 

+ 1 - 1
apps/app/src/server/service/slack-command-handler/help.js

@@ -3,7 +3,7 @@
  * the help message should vary depending on the growi version
  */
 
-const { markdownSectionBlock } = require('@growi/slack');
+import { markdownSectionBlock } from '@growi/slack/dist/utils/block-kit-builder';
 
 module.exports = (crowi) => {
   const BaseSlackCommandHandler = require('./slack-command-handler');

+ 5 - 3
apps/app/src/server/service/slack-command-handler/keep.js

@@ -1,10 +1,12 @@
+import {
+  inputBlock, actionsBlock, buttonElement, markdownSectionBlock,
+} from '@growi/slack/dist/utils/block-kit-builder';
+
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:service:SlackBotService:keep');
-const {
-  inputBlock, actionsBlock, buttonElement, markdownSectionBlock,
-} = require('@growi/slack');
 const { parse, format } = require('date-fns');
+
 const { SlackCommandHandlerError } = require('../../models/vo/slack-command-handler-error');
 
 module.exports = (crowi) => {

+ 4 - 3
apps/app/src/server/service/slack-command-handler/note.js

@@ -1,8 +1,9 @@
+import {
+  markdownHeaderBlock, inputSectionBlock, inputBlock, actionsBlock, buttonElement,
+} from '@growi/slack/dist/utils/block-kit-builder';
+
 import loggerFactory from '~/utils/logger';
 
-const {
-  markdownHeaderBlock, inputSectionBlock, inputBlock, actionsBlock, buttonElement,
-} = require('@growi/slack');
 const { SlackCommandHandlerError } = require('../../models/vo/slack-command-handler-error');
 
 const logger = loggerFactory('growi:service:SlackCommandHandler:note');

+ 6 - 3
apps/app/src/server/service/slack-command-handler/search.js

@@ -1,10 +1,13 @@
+import {
+  markdownSectionBlock, divider,
+} from '@growi/slack/dist/utils/block-kit-builder';
+import { generateLastUpdateMrkdwn } from '@growi/slack/dist/utils/generate-last-update-markdown';
+
 import loggerFactory from '~/utils/logger';
 
+
 const logger = loggerFactory('growi:service:SlackCommandHandler:search');
 
-const {
-  markdownSectionBlock, divider, generateLastUpdateMrkdwn,
-} = require('@growi/slack');
 const { formatDistanceStrict } = require('date-fns');
 
 const PAGINGLIMIT = 7;

+ 8 - 5
apps/app/src/server/service/slack-command-handler/togetter.js

@@ -1,12 +1,15 @@
+import {
+  inputBlock, actionsBlock, buttonElement, markdownSectionBlock, divider,
+} from '@growi/slack/dist/utils/block-kit-builder';
+import { respond, deleteOriginal } from '@growi/slack/dist/utils/response-url';
+
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:service:SlackBotService:togetter');
-const {
-  inputBlock, actionsBlock, buttonElement, markdownSectionBlock, divider, respond,
-  deleteOriginal,
-} = require('@growi/slack');
-const { parse, format } = require('date-fns');
+
 const axios = require('axios');
+const { parse, format } = require('date-fns');
+
 const { SlackCommandHandlerError } = require('../../models/vo/slack-command-handler-error');
 
 module.exports = (crowi) => {

+ 2 - 1
apps/app/src/server/service/slack-event-handler/link-shared.ts

@@ -1,4 +1,5 @@
-import { type GrowiBotEvent, generateLastUpdateMrkdwn } from '@growi/slack';
+import type { GrowiBotEvent } from '@growi/slack';
+import { generateLastUpdateMrkdwn } from '@growi/slack/dist/utils/generate-last-update-markdown';
 import type {
   MessageAttachment, LinkUnfurls, WebClient,
 } from '@slack/web-api';

+ 5 - 4
apps/app/src/server/service/slack-integration.ts

@@ -1,9 +1,10 @@
-import type {
-  GrowiCommand, RespondUtil, GrowiBotEvent,
-} from '@growi/slack';
 import {
-  generateWebClient, InteractionPayloadAccessor, markdownSectionBlock, SlackbotType,
+  SlackbotType, type GrowiCommand, type GrowiBotEvent,
 } from '@growi/slack';
+import { markdownSectionBlock } from '@growi/slack/dist/utils/block-kit-builder';
+import { InteractionPayloadAccessor } from '@growi/slack/dist/utils/interaction-payload-accessor';
+import type { RespondUtil } from '@growi/slack/dist/utils/respond-util-factory';
+import { generateWebClient } from '@growi/slack/dist/utils/webclient-factory';
 import { ChatPostMessageArguments, WebClient } from '@slack/web-api';
 import { IncomingWebhookSendArguments } from '@slack/webhook';
 import mongoose from 'mongoose';

+ 3 - 1
apps/app/src/server/util/slack-integration.ts

@@ -1,4 +1,6 @@
-import { getSupportedGrowiActionsRegExp, type IChannelOptionalId, permissionParser } from '@growi/slack';
+import type { IChannelOptionalId } from '@growi/slack';
+import { getSupportedGrowiActionsRegExp } from '@growi/slack/dist/utils/get-supported-growi-actions-regexps';
+import { permissionParser } from '@growi/slack/dist/utils/permission-parser';
 
 type CommandPermission = { [key:string]: string[] | boolean }