2
0
Эх сурвалжийг харах

reorganize import line order for slackbot-proxy

Yuki Takei 4 жил өмнө
parent
commit
87903a7abb
27 өөрчлөгдсөн 70 нэмэгдсэн , 68 устгасан
  1. 8 7
      packages/slackbot-proxy/src/Server.ts
  2. 9 12
      packages/slackbot-proxy/src/controllers/growi-to-slack.ts
  3. 11 13
      packages/slackbot-proxy/src/controllers/slack.ts
  4. 1 2
      packages/slackbot-proxy/src/controllers/top.ts
  5. 1 1
      packages/slackbot-proxy/src/entities/installation.ts
  6. 1 0
      packages/slackbot-proxy/src/entities/order.ts
  7. 1 0
      packages/slackbot-proxy/src/entities/relation.ts
  8. 1 1
      packages/slackbot-proxy/src/interfaces/growi-to-slack/growi-req.ts
  9. 0 1
      packages/slackbot-proxy/src/middlewares/GlobalHttpErrorHandlingMiddleware.ts
  10. 0 2
      packages/slackbot-proxy/src/middlewares/slack-to-growi/authorizer.ts
  11. 1 1
      packages/slackbot-proxy/src/middlewares/slack-to-growi/extract-growi-uri-from-req.ts
  12. 1 2
      packages/slackbot-proxy/src/middlewares/slack-to-growi/join-to-conversation.ts
  13. 1 2
      packages/slackbot-proxy/src/middlewares/slack-to-growi/parse-interaction-req.ts
  14. 1 0
      packages/slackbot-proxy/src/middlewares/slack-to-growi/url-verification.ts
  15. 0 1
      packages/slackbot-proxy/src/models/errors.ts
  16. 4 3
      packages/slackbot-proxy/src/services/LinkSharedService.ts
  17. 9 6
      packages/slackbot-proxy/src/services/RegisterService.ts
  18. 3 5
      packages/slackbot-proxy/src/services/RelationsService.ts
  19. 2 2
      packages/slackbot-proxy/src/services/SelectGrowiService.ts
  20. 2 2
      packages/slackbot-proxy/src/services/SystemInformationService.ts
  21. 5 4
      packages/slackbot-proxy/src/services/UnregisterService.ts
  22. 2 0
      packages/slackbot-proxy/src/services/growi-uri-injector/ActionsBlockPayloadDelegator.ts
  23. 2 0
      packages/slackbot-proxy/src/services/growi-uri-injector/SectionBlockPayloadDelegator.ts
  24. 1 0
      packages/slackbot-proxy/src/services/growi-uri-injector/ViewInteractionPayloadDelegator.ts
  25. 1 0
      packages/slackbot-proxy/src/services/growi-uri-injector/block-elements/ButtonActionPayloadDelegator.ts
  26. 1 0
      packages/slackbot-proxy/src/services/growi-uri-injector/block-elements/CheckboxesActionPayloadDelegator.ts
  27. 1 1
      packages/slackbot-proxy/src/utils/welcome-message.ts

+ 8 - 7
packages/slackbot-proxy/src/Server.ts

@@ -1,26 +1,27 @@
-import { Configuration, Inject, InjectorService } from '@tsed/di';
-import { HttpServer, PlatformApplication } from '@tsed/common';
 import '@tsed/platform-express'; // !! DO NOT MODIFY !!
 import '@tsed/typeorm'; // !! DO NOT MODIFY !! -- https://github.com/tsedio/tsed/issues/1332#issuecomment-837840612
 import '@tsed/swagger';
 
+import { createTerminus } from '@godaddy/terminus';
+import { HttpServer, PlatformApplication } from '@tsed/common';
+import { Configuration, Inject, InjectorService } from '@tsed/di';
 import bodyParser from 'body-parser';
 import compress from 'compression';
 import cookieParser from 'cookie-parser';
-import methodOverride from 'method-override';
-import helmet from 'helmet';
 import { Express } from 'express';
 import expressBunyanLogger from 'express-bunyan-logger';
-
+import helmet from 'helmet';
+import methodOverride from 'method-override';
 import { ConnectionOptions, getConnectionManager } from 'typeorm';
-import { createTerminus } from '@godaddy/terminus';
 
 import swaggerSettingsForDev from '~/config/swagger/config.dev';
 import swaggerSettingsForProd from '~/config/swagger/config.prod';
+import loggerFactory from '~/utils/logger';
+
 import { GlobalHttpErrorHandlingMiddleware } from './middlewares/GlobalHttpErrorHandlingMiddleware';
+
 import './filters/CustomHttpErrorFilter';
 import './filters/ResourceNotFoundFilter';
-import loggerFactory from '~/utils/logger';
 
 export const rootDir = __dirname;
 const isProduction = process.env.NODE_ENV === 'production';

+ 9 - 12
packages/slackbot-proxy/src/controllers/growi-to-slack.ts

@@ -1,28 +1,25 @@
+import {
+  verifyGrowiToSlackRequest, getConnectionStatuses, getConnectionStatus, REQUEST_TIMEOUT_FOR_PTOG, generateWebClient, BlockKitRequest,
+} from '@growi/slack';
+import { ErrorCode, WebAPICallResult } from '@slack/web-api';
 import {
   Controller, Get, Post, Inject, Req, Res, UseBefore, PathParams, Put, QueryParams,
 } from '@tsed/common';
 import axios from 'axios';
-import createError from 'http-errors';
 import { addHours } from 'date-fns';
+import createError from 'http-errors';
 
-import { ErrorCode, WebAPICallResult } from '@slack/web-api';
-
-import {
-  verifyGrowiToSlackRequest, getConnectionStatuses, getConnectionStatus, REQUEST_TIMEOUT_FOR_PTOG, generateWebClient, BlockKitRequest,
-} from '@growi/slack';
-
-import { WebclientRes, AddWebclientResponseToRes } from '~/middlewares/growi-to-slack/add-webclient-response-to-res';
 
 import { GrowiReq } from '~/interfaces/growi-to-slack/growi-req';
+import { WebclientRes, AddWebclientResponseToRes } from '~/middlewares/growi-to-slack/add-webclient-response-to-res';
 import { InstallationRepository } from '~/repositories/installation';
-import { RelationRepository } from '~/repositories/relation';
 import { OrderRepository } from '~/repositories/order';
-
+import { RelationRepository } from '~/repositories/relation';
 import { InstallerService } from '~/services/InstallerService';
-import loggerFactory from '~/utils/logger';
-import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/ViewInteractionPayloadDelegator';
 import { ActionsBlockPayloadDelegator } from '~/services/growi-uri-injector/ActionsBlockPayloadDelegator';
 import { SectionBlockPayloadDelegator } from '~/services/growi-uri-injector/SectionBlockPayloadDelegator';
+import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/ViewInteractionPayloadDelegator';
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('slackbot-proxy:controllers:growi-to-slack');

+ 11 - 13
packages/slackbot-proxy/src/controllers/slack.ts

@@ -1,11 +1,3 @@
-import {
-  Controller, Get, Inject, PlatformResponse, Post, Req, Res, UseBefore,
-} from '@tsed/common';
-
-import axios from 'axios';
-
-import { WebAPICallResult } from '@slack/web-api';
-import { Installation } from '@slack/oauth';
 
 
 import {
@@ -14,23 +6,29 @@ import {
   parseSlackInteractionRequest, verifySlackRequest,
   respond, supportedGrowiCommands, IChannelOptionalId,
 } from '@growi/slack';
+import { Installation } from '@slack/oauth';
+import { WebAPICallResult } from '@slack/web-api';
+import {
+  Controller, Get, Inject, PlatformResponse, Post, Req, Res, UseBefore,
+} from '@tsed/common';
+import axios from 'axios';
 
 import { Relation } from '~/entities/relation';
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
-import { InstallationRepository } from '~/repositories/installation';
-import { RelationRepository } from '~/repositories/relation';
-import { OrderRepository } from '~/repositories/order';
 import { AddSigningSecretToReq } from '~/middlewares/slack-to-growi/add-signing-secret-to-req';
 import {
   AuthorizeCommandMiddleware, AuthorizeInteractionMiddleware, AuthorizeEventsMiddleware,
 } from '~/middlewares/slack-to-growi/authorizer';
-import { UrlVerificationMiddleware } from '~/middlewares/slack-to-growi/url-verification';
 import { ExtractGrowiUriFromReq } from '~/middlewares/slack-to-growi/extract-growi-uri-from-req';
+import { UrlVerificationMiddleware } from '~/middlewares/slack-to-growi/url-verification';
+import { InstallationRepository } from '~/repositories/installation';
+import { OrderRepository } from '~/repositories/order';
+import { RelationRepository } from '~/repositories/relation';
 import { InstallerService } from '~/services/InstallerService';
-import { SelectGrowiService } from '~/services/SelectGrowiService';
 import { LinkSharedService } from '~/services/LinkSharedService';
 import { RegisterService } from '~/services/RegisterService';
 import { RelationsService } from '~/services/RelationsService';
+import { SelectGrowiService } from '~/services/SelectGrowiService';
 import { UnregisterService } from '~/services/UnregisterService';
 import loggerFactory from '~/utils/logger';
 import { postInstallSuccessMessage, postWelcomeMessageOnce } from '~/utils/welcome-message';

+ 1 - 2
packages/slackbot-proxy/src/controllers/top.ts

@@ -1,10 +1,9 @@
+import { requiredScopes } from '@growi/slack';
 import {
   Controller, Get, Inject, View,
 } from '@tsed/common';
-
 import readPkgUp from 'read-pkg-up';
 
-import { requiredScopes } from '@growi/slack';
 import { InstallerService } from '~/services/InstallerService';
 
 const isOfficialMode = process.env.OFFICIAL_MODE === 'true';

+ 1 - 1
packages/slackbot-proxy/src/entities/installation.ts

@@ -1,3 +1,4 @@
+import { Installation as SlackInstallation } from '@slack/oauth';
 import {
   Required,
 } from '@tsed/schema';
@@ -5,7 +6,6 @@ import {
   Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn,
 } from 'typeorm';
 
-import { Installation as SlackInstallation } from '@slack/oauth';
 
 @Entity()
 export class Installation {

+ 1 - 0
packages/slackbot-proxy/src/entities/order.ts

@@ -1,6 +1,7 @@
 import {
   Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, ManyToOne,
 } from 'typeorm';
+
 import { Installation } from './installation';
 
 @Entity()

+ 1 - 0
packages/slackbot-proxy/src/entities/relation.ts

@@ -2,6 +2,7 @@ import { differenceInMilliseconds } from 'date-fns';
 import {
   Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, ManyToOne, Index,
 } from 'typeorm';
+
 import { Installation } from './installation';
 
 export interface PermissionSettingsInterface {

+ 1 - 1
packages/slackbot-proxy/src/interfaces/growi-to-slack/growi-req.ts

@@ -1,4 +1,4 @@
-import { Req } from '@tsed/common';
 import { RequestFromGrowi } from '@growi/slack';
+import { Req } from '@tsed/common';
 
 export type GrowiReq = Req & RequestFromGrowi;

+ 0 - 1
packages/slackbot-proxy/src/middlewares/GlobalHttpErrorHandlingMiddleware.ts

@@ -1,7 +1,6 @@
 import {
   Err, Middleware, Next, PlatformContext, PlatformResponse,
 } from '@tsed/common';
-
 import { HttpError, isHttpError } from 'http-errors';
 
 @Middleware()

+ 0 - 2
packages/slackbot-proxy/src/middlewares/slack-to-growi/authorizer.ts

@@ -2,9 +2,7 @@ import { AuthorizeResult, InstallationQuery } from '@slack/oauth';
 import {
   IMiddleware, Inject, Middleware, Next, Req, Res,
 } from '@tsed/common';
-
 import Logger from 'bunyan';
-
 import createError from 'http-errors';
 
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';

+ 1 - 1
packages/slackbot-proxy/src/middlewares/slack-to-growi/extract-growi-uri-from-req.ts

@@ -3,8 +3,8 @@ import {
 } from '@tsed/common';
 
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
-import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/ViewInteractionPayloadDelegator';
 import { ActionsBlockPayloadDelegator } from '~/services/growi-uri-injector/ActionsBlockPayloadDelegator';
+import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/ViewInteractionPayloadDelegator';
 
 
 @Middleware()

+ 1 - 2
packages/slackbot-proxy/src/middlewares/slack-to-growi/join-to-conversation.ts

@@ -2,10 +2,9 @@ import { generateWebClient } from '@growi/slack';
 import {
   IMiddleware, Middleware, Req,
 } from '@tsed/common';
-
 import Logger from 'bunyan';
-import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 
+import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 import loggerFactory from '~/utils/logger';
 
 const logger: Logger = loggerFactory('slackbot-proxy:middlewares:JoinToConversationsMiddleware');

+ 1 - 2
packages/slackbot-proxy/src/middlewares/slack-to-growi/parse-interaction-req.ts

@@ -1,9 +1,8 @@
+import { RequestFromSlack } from '@growi/slack';
 import {
   IMiddleware, Middleware, Next, Req,
 } from '@tsed/common';
 
-import { RequestFromSlack } from '@growi/slack';
-
 
 @Middleware()
 export class ParseInteractionPayloadMiddleare implements IMiddleware {

+ 1 - 0
packages/slackbot-proxy/src/middlewares/slack-to-growi/url-verification.ts

@@ -1,6 +1,7 @@
 import {
   IMiddleware, Middleware, Req, Res, Next,
 } from '@tsed/common';
+
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 
 

+ 0 - 1
packages/slackbot-proxy/src/models/errors.ts

@@ -1,5 +1,4 @@
 import ExtensibleCustomError from 'extensible-custom-error';
-
 import { HttpError } from 'http-errors';
 
 export class InvalidUrlError extends ExtensibleCustomError {

+ 4 - 3
packages/slackbot-proxy/src/services/LinkSharedService.ts

@@ -1,9 +1,10 @@
-import axios from 'axios';
-import { Inject, Service } from '@tsed/di';
 import { GrowiEventProcessor, REQUEST_TIMEOUT_FOR_PTOG } from '@growi/slack';
 import { WebClient } from '@slack/web-api';
-import loggerFactory from '~/utils/logger';
+import { Inject, Service } from '@tsed/di';
+import axios from 'axios';
+
 import { RelationRepository } from '~/repositories/relation';
+import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('slackbot-proxy:services:LinkSharedService');
 

+ 9 - 6
packages/slackbot-proxy/src/services/RegisterService.ts

@@ -1,18 +1,21 @@
-import { Inject, Service } from '@tsed/di';
-import {
-  WebClient, LogLevel, Block, ConversationsSelect,
-} from '@slack/web-api';
 import {
   markdownSectionBlock, markdownHeaderBlock, inputSectionBlock, GrowiCommand, inputBlock,
   respond, GrowiCommandProcessor, GrowiInteractionProcessor,
   getInteractionIdRegexpFromCommandName, InteractionHandledResult, InteractionPayloadAccessor,
 } from '@growi/slack';
 import { AuthorizeResult } from '@slack/oauth';
-import { OrderRepository } from '~/repositories/order';
-import { InvalidUrlError } from '../models/errors';
+import {
+  WebClient, LogLevel, Block, ConversationsSelect,
+} from '@slack/web-api';
+import { Inject, Service } from '@tsed/di';
+
+
 import { InstallationRepository } from '~/repositories/installation';
+import { OrderRepository } from '~/repositories/order';
 import loggerFactory from '~/utils/logger';
 
+import { InvalidUrlError } from '../models/errors';
+
 const logger = loggerFactory('slackbot-proxy:services:RegisterService');
 
 const isProduction = process.env.NODE_ENV === 'production';

+ 3 - 5
packages/slackbot-proxy/src/services/RelationsService.ts

@@ -1,14 +1,12 @@
+import {
+  REQUEST_TIMEOUT_FOR_PTOG, getSupportedGrowiActionsRegExp, IChannelOptionalId, permissionParser,
+} from '@growi/slack';
 import { Inject, Service } from '@tsed/di';
-
 import axios from 'axios';
 import { addHours } from 'date-fns';
 
-import {
-  REQUEST_TIMEOUT_FOR_PTOG, getSupportedGrowiActionsRegExp, IChannelOptionalId, permissionParser,
-} from '@growi/slack';
 import { Relation, PermissionSettingsInterface } from '~/entities/relation';
 import { RelationRepository } from '~/repositories/relation';
-
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('slackbot-proxy:services:RelationsService');

+ 2 - 2
packages/slackbot-proxy/src/services/SelectGrowiService.ts

@@ -1,4 +1,3 @@
-import { Inject, Service } from '@tsed/di';
 
 import {
   getInteractionIdRegexpFromCommandName,
@@ -6,11 +5,12 @@ import {
   InteractionHandledResult, markdownSectionBlock, replaceOriginal, respond, InteractionPayloadAccessor,
 } from '@growi/slack';
 import { AuthorizeResult } from '@slack/oauth';
+import { Inject, Service } from '@tsed/di';
 
 import { Installation } from '~/entities/installation';
 import { Relation } from '~/entities/relation';
-import { RelationRepository } from '~/repositories/relation';
 import { InstallationRepository } from '~/repositories/installation';
+import { RelationRepository } from '~/repositories/relation';
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('slackbot-proxy:services:UnregisterService');

+ 2 - 2
packages/slackbot-proxy/src/services/SystemInformationService.ts

@@ -1,12 +1,12 @@
 import { Inject, Service } from '@tsed/di';
-
 import readPkgUp from 'read-pkg-up';
 
 import { SystemInformation } from '~/entities/system-information';
 import { SystemInformationRepository } from '~/repositories/system-information';
-import { RelationsService } from './RelationsService';
 import loggerFactory from '~/utils/logger';
 
+import { RelationsService } from './RelationsService';
+
 const logger = loggerFactory('slackbot-proxy:services:SystemInformationService');
 
 @Service()

+ 5 - 4
packages/slackbot-proxy/src/services/UnregisterService.ts

@@ -1,16 +1,17 @@
-import axios from 'axios';
-import { Inject, Service } from '@tsed/di';
-import { MultiStaticSelect } from '@slack/web-api';
 import {
   actionsBlock, buttonElement, getInteractionIdRegexpFromCommandName,
   GrowiCommand, GrowiCommandProcessor, GrowiInteractionProcessor,
   inputBlock, InteractionHandledResult, markdownSectionBlock, respond, InteractionPayloadAccessor, replaceOriginal,
 } from '@growi/slack';
 import { AuthorizeResult } from '@slack/oauth';
+import { MultiStaticSelect } from '@slack/web-api';
+import { Inject, Service } from '@tsed/di';
+import axios from 'axios';
 import { DeleteResult } from 'typeorm';
-import { RelationRepository } from '~/repositories/relation';
+
 import { Installation } from '~/entities/installation';
 import { InstallationRepository } from '~/repositories/installation';
+import { RelationRepository } from '~/repositories/relation';
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('slackbot-proxy:services:UnregisterService');

+ 2 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/ActionsBlockPayloadDelegator.ts

@@ -1,7 +1,9 @@
 import { Inject, OnInit, Service } from '@tsed/di';
+
 import {
   GrowiUriInjector, GrowiUriWithOriginalData, TypedBlock,
 } from '~/interfaces/growi-uri-injector';
+
 import { ButtonActionPayloadDelegator } from './block-elements/ButtonActionPayloadDelegator';
 import { CheckboxesActionPayloadDelegator } from './block-elements/CheckboxesActionPayloadDelegator';
 

+ 2 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/SectionBlockPayloadDelegator.ts

@@ -1,7 +1,9 @@
 import { Inject, OnInit, Service } from '@tsed/di';
+
 import {
   GrowiUriInjector, GrowiUriWithOriginalData, TypedBlock,
 } from '~/interfaces/growi-uri-injector';
+
 import { ButtonActionPayloadDelegator } from './block-elements/ButtonActionPayloadDelegator';
 import { CheckboxesActionPayloadDelegator } from './block-elements/CheckboxesActionPayloadDelegator';
 

+ 1 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/ViewInteractionPayloadDelegator.ts

@@ -1,4 +1,5 @@
 import { Service } from '@tsed/di';
+
 import {
   GrowiUriInjector, GrowiUriWithOriginalData, isGrowiUriWithOriginalData, TypedBlock,
 } from '~/interfaces/growi-uri-injector';

+ 1 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/block-elements/ButtonActionPayloadDelegator.ts

@@ -1,4 +1,5 @@
 import { Service } from '@tsed/di';
+
 import { GrowiUriWithOriginalData, GrowiUriInjector, TypedBlock } from '~/interfaces/growi-uri-injector';
 
 

+ 1 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/block-elements/CheckboxesActionPayloadDelegator.ts

@@ -1,4 +1,5 @@
 import { Service } from '@tsed/di';
+
 import { GrowiUriWithOriginalData, GrowiUriInjector, TypedBlock } from '~/interfaces/growi-uri-injector';
 
 

+ 1 - 1
packages/slackbot-proxy/src/utils/welcome-message.ts

@@ -1,5 +1,5 @@
-import { ChatPostMessageResponse, WebClient } from '@slack/web-api';
 import { markdownSectionBlock } from '@growi/slack';
+import { ChatPostMessageResponse, WebClient } from '@slack/web-api';
 
 export const postWelcomeMessageOnce = async(client: WebClient, channel: string): Promise<void|ChatPostMessageResponse> => {
   const history = await client.conversations.history({