aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-08-06 14:58:01 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-08-07 08:28:14 +0200
commitbd45d503e5d007e730f4e81dccd7e7864c9a85cc (patch)
treeb78df768b8253ba401232c17da940cea016c9960 /server/controllers
parent583eb04b541175035d6d452ca626a96ebf2b7437 (diff)
downloadPeerTube-bd45d503e5d007e730f4e81dccd7e7864c9a85cc.tar.gz
PeerTube-bd45d503e5d007e730f4e81dccd7e7864c9a85cc.tar.zst
PeerTube-bd45d503e5d007e730f4e81dccd7e7864c9a85cc.zip
Reorganize shared models
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/abuse.ts7
-rw-r--r--server/controllers/client.ts10
-rw-r--r--server/controllers/plugins.ts2
3 files changed, 10 insertions, 9 deletions
diff --git a/server/controllers/api/abuse.ts b/server/controllers/api/abuse.ts
index 03e6be8c8..b97b99f16 100644
--- a/server/controllers/api/abuse.ts
+++ b/server/controllers/api/abuse.ts
@@ -1,9 +1,12 @@
1import * as express from 'express' 1import * as express from 'express'
2import { logger } from '@server/helpers/logger'
2import { createAccountAbuse, createVideoAbuse, createVideoCommentAbuse } from '@server/lib/moderation' 3import { createAccountAbuse, createVideoAbuse, createVideoCommentAbuse } from '@server/lib/moderation'
4import { Notifier } from '@server/lib/notifier'
3import { AbuseModel } from '@server/models/abuse/abuse' 5import { AbuseModel } from '@server/models/abuse/abuse'
4import { AbuseMessageModel } from '@server/models/abuse/abuse-message' 6import { AbuseMessageModel } from '@server/models/abuse/abuse-message'
5import { getServerActor } from '@server/models/application/application' 7import { getServerActor } from '@server/models/application/application'
6import { AbuseCreate, abusePredefinedReasonsMap, AbuseState, UserRight } from '../../../shared' 8import { abusePredefinedReasonsMap } from '@shared/core-utils/abuse'
9import { AbuseCreate, AbuseState, UserRight } from '../../../shared'
7import { getFormattedObjects } from '../../helpers/utils' 10import { getFormattedObjects } from '../../helpers/utils'
8import { sequelizeTypescript } from '../../initializers/database' 11import { sequelizeTypescript } from '../../initializers/database'
9import { 12import {
@@ -25,8 +28,6 @@ import {
25 setDefaultSort 28 setDefaultSort
26} from '../../middlewares' 29} from '../../middlewares'
27import { AccountModel } from '../../models/account/account' 30import { AccountModel } from '../../models/account/account'
28import { Notifier } from '@server/lib/notifier'
29import { logger } from '@server/helpers/logger'
30 31
31const abuseRouter = express.Router() 32const abuseRouter = express.Router()
32 33
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 8c7f881a9..7c80820f4 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,13 +1,13 @@
1import { constants, promises as fs } from 'fs'
2import * as express from 'express' 1import * as express from 'express'
2import { constants, promises as fs } from 'fs'
3import { join } from 'path' 3import { join } from 'path'
4import { CONFIG } from '@server/initializers/config'
5import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '@shared/core-utils/i18n'
4import { root } from '../helpers/core-utils' 6import { root } from '../helpers/core-utils'
7import { logger } from '../helpers/logger'
5import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers/constants' 8import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers/constants'
6import { asyncMiddleware, embedCSP } from '../middlewares'
7import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '../../shared/models/i18n/i18n'
8import { ClientHtml } from '../lib/client-html' 9import { ClientHtml } from '../lib/client-html'
9import { logger } from '../helpers/logger' 10import { asyncMiddleware, embedCSP } from '../middlewares'
10import { CONFIG } from '@server/initializers/config'
11 11
12const clientsRouter = express.Router() 12const clientsRouter = express.Router()
13 13
diff --git a/server/controllers/plugins.ts b/server/controllers/plugins.ts
index f88a1632d..7b947bb6e 100644
--- a/server/controllers/plugins.ts
+++ b/server/controllers/plugins.ts
@@ -6,7 +6,7 @@ import { getPluginValidator, pluginStaticDirectoryValidator, getExternalAuthVali
6import { serveThemeCSSValidator } from '../middlewares/validators/themes' 6import { serveThemeCSSValidator } from '../middlewares/validators/themes'
7import { PluginType } from '../../shared/models/plugins/plugin.type' 7import { PluginType } from '../../shared/models/plugins/plugin.type'
8import { isTestInstance } from '../helpers/core-utils' 8import { isTestInstance } from '../helpers/core-utils'
9import { getCompleteLocale, is18nLocale } from '../../shared/models/i18n' 9import { getCompleteLocale, is18nLocale } from '../../shared/core-utils/i18n'
10import { logger } from '@server/helpers/logger' 10import { logger } from '@server/helpers/logger'
11 11
12const sendFileOptions = { 12const sendFileOptions = {