15 files changed, 16 insertions, 16 deletions
diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts
index c05f60f14..deb331abb 100644
--- a/server/helpers/custom-validators/activitypub/actor.ts
+++ b/server/helpers/custom-validators/activitypub/actor.ts
@@ -1,5 +1,5 @@
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS } from '../../../initializers'
+import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
 import { exists, isArray } from '../misc'
 import { truncate } from 'lodash'
 import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'
diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts
index f1762d11c..f9445929b 100644
--- a/server/helpers/custom-validators/activitypub/misc.ts
+++ b/server/helpers/custom-validators/activitypub/misc.ts
@@ -1,5 +1,5 @@
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS } from '../../../initializers'
+import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
 import { isTestInstance } from '../../core-utils'
 import { exists } from '../misc'
diff --git a/server/helpers/custom-validators/activitypub/video-comments.ts b/server/helpers/custom-validators/activitypub/video-comments.ts
index 0415db21c..26c8c4cc6 100644
--- a/server/helpers/custom-validators/activitypub/video-comments.ts
+++ b/server/helpers/custom-validators/activitypub/video-comments.ts
@@ -1,7 +1,7 @@
 import * as validator from 'validator'
-import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers'
+import { ACTIVITY_PUB } from '../../../initializers/constants'
 import { exists, isArray, isDateValid } from '../misc'
-import { isActivityPubUrlValid, isBaseActivityValid } from './misc'
+import { isActivityPubUrlValid } from './misc'
 function sanitizeAndCheckVideoCommentObject (comment: any) {
  if (!comment || comment.type !== 'Note') return false
diff --git a/server/helpers/custom-validators/activitypub/videos.ts b/server/helpers/custom-validators/activitypub/videos.ts
index d94333151..3ba6b0744 100644
--- a/server/helpers/custom-validators/activitypub/videos.ts
+++ b/server/helpers/custom-validators/activitypub/videos.ts
@@ -1,5 +1,5 @@
 import * as validator from 'validator'
-import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers'
+import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers/constants'
 import { peertubeTruncate } from '../../core-utils'
 import { exists, isArray, isBooleanValid, isDateValid, isUUIDValid } from '../misc'
 import {
diff --git a/server/helpers/custom-validators/servers.ts b/server/helpers/custom-validators/servers.ts
index 18c80ec8f..5c8bf0d2d 100644
--- a/server/helpers/custom-validators/servers.ts
+++ b/server/helpers/custom-validators/servers.ts
@@ -3,7 +3,7 @@ import 'express-validator'
 import { isArray, exists } from './misc'
 import { isTestInstance } from '../core-utils'
-import { CONSTRAINTS_FIELDS } from '../../initializers'
+import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 function isHostValid (host: string) {
  const isURLOptions = {
diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts
index 80652b479..70af5f1f0 100644
--- a/server/helpers/custom-validators/users.ts
+++ b/server/helpers/custom-validators/users.ts
@@ -1,7 +1,7 @@
 import 'express-validator'
 import * as validator from 'validator'
 import { UserRole } from '../../../shared'
-import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers'
+import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants'
 import { exists, isFileValid, isBooleanValid } from './misc'
 import { values } from 'lodash'
diff --git a/server/helpers/custom-validators/video-abuses.ts b/server/helpers/custom-validators/video-abuses.ts
index 71500fde5..a61dcee1c 100644
--- a/server/helpers/custom-validators/video-abuses.ts
+++ b/server/helpers/custom-validators/video-abuses.ts
@@ -1,6 +1,6 @@
 import { Response } from 'express'
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers'
+import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers/constants'
 import { exists } from './misc'
 import { VideoAbuseModel } from '../../models/video/video-abuse'
diff --git a/server/helpers/custom-validators/video-blacklist.ts b/server/helpers/custom-validators/video-blacklist.ts
index 465f58a9c..3743f7023 100644
--- a/server/helpers/custom-validators/video-blacklist.ts
+++ b/server/helpers/custom-validators/video-blacklist.ts
@@ -1,7 +1,7 @@
 import { Response } from 'express'
 import * as validator from 'validator'
 import { exists } from './misc'
-import { CONSTRAINTS_FIELDS } from '../../initializers'
+import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 import { VideoBlacklistModel } from '../../models/video/video-blacklist'
 import { VideoBlacklistType } from '../../../shared/models/videos'
diff --git a/server/helpers/custom-validators/video-captions.ts b/server/helpers/custom-validators/video-captions.ts
index 8bd139003..3b6569a8a 100644
--- a/server/helpers/custom-validators/video-captions.ts
+++ b/server/helpers/custom-validators/video-captions.ts
@@ -1,4 +1,4 @@
-import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_LANGUAGES } from '../../initializers'
+import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_LANGUAGES } from '../../initializers/constants'
 import { exists, isFileValid } from './misc'
 import { Response } from 'express'
 import { VideoModel } from '../../models/video/video'
diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts
index ca8d207cf..fd56b9a70 100644
--- a/server/helpers/custom-validators/video-channels.ts
+++ b/server/helpers/custom-validators/video-channels.ts
@@ -2,7 +2,7 @@ import * as express from 'express'
 import 'express-validator'
 import 'multer'
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS } from '../../initializers'
+import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 import { VideoChannelModel } from '../../models/video/video-channel'
 import { exists } from './misc'
diff --git a/server/helpers/custom-validators/video-comments.ts b/server/helpers/custom-validators/video-comments.ts
index 2b3f66063..0707e2af2 100644
--- a/server/helpers/custom-validators/video-comments.ts
+++ b/server/helpers/custom-validators/video-comments.ts
@@ -1,7 +1,7 @@
 import 'express-validator'
 import 'multer'
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS } from '../../initializers'
+import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 const VIDEO_COMMENTS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_COMMENTS
diff --git a/server/helpers/custom-validators/video-imports.ts b/server/helpers/custom-validators/video-imports.ts
index 14db9b534..f4235e2fa 100644
--- a/server/helpers/custom-validators/video-imports.ts
+++ b/server/helpers/custom-validators/video-imports.ts
@@ -1,7 +1,7 @@
 import 'express-validator'
 import 'multer'
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_IMPORT_STATES } from '../../initializers'
+import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_IMPORT_STATES } from '../../initializers/constants'
 import { exists, isFileValid } from './misc'
 import * as express from 'express'
 import { VideoImportModel } from '../../models/video/video-import'
diff --git a/server/helpers/custom-validators/video-playlists.ts b/server/helpers/custom-validators/video-playlists.ts
index c962c5532..2fe426560 100644
--- a/server/helpers/custom-validators/video-playlists.ts
+++ b/server/helpers/custom-validators/video-playlists.ts
@@ -1,6 +1,6 @@
 import { exists } from './misc'
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS, VIDEO_PLAYLIST_PRIVACIES, VIDEO_PLAYLIST_TYPES } from '../../initializers'
+import { CONSTRAINTS_FIELDS, VIDEO_PLAYLIST_PRIVACIES, VIDEO_PLAYLIST_TYPES } from '../../initializers/constants'
 import * as express from 'express'
 import { VideoPlaylistModel } from '../../models/video/video-playlist'
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index dd9d62d24..eb08ae4ad 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -11,7 +11,7 @@ import {
  VIDEO_PRIVACIES,
  VIDEO_RATE_TYPES,
  VIDEO_STATES
-} from '../../initializers'
+} from '../../initializers/constants'
 import { VideoModel } from '../../models/video/video'
 import { exists, isArray, isDateValid, isFileValid } from './misc'
 import { VideoChannelModel } from '../../models/video/video-channel'
diff --git a/server/helpers/custom-validators/webfinger.ts b/server/helpers/custom-validators/webfinger.ts
index b18e43fad..dd914341e 100644
--- a/server/helpers/custom-validators/webfinger.ts
+++ b/server/helpers/custom-validators/webfinger.ts
@@ -1,4 +1,4 @@
-import { REMOTE_SCHEME, WEBSERVER } from '../../initializers'
+import { REMOTE_SCHEME, WEBSERVER } from '../../initializers/constants'
 import { sanitizeHost } from '../core-utils'
 import { exists } from './misc'

diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts index c05f60f14..deb331abb 100644 --- a/server/helpers/custom-validators/activitypub/actor.ts +++ b/server/helpers/custom-validators/activitypub/actor.ts
@@ -1,5 +1,5 @@
1	import * as validator from 'validator'	1	import * as validator from 'validator'
2	import { CONSTRAINTS_FIELDS } from '../../../initializers'	2	import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
3	import { exists, isArray } from '../misc'	3	import { exists, isArray } from '../misc'
4	import { truncate } from 'lodash'	4	import { truncate } from 'lodash'
5	import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'	5	import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'


diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts index f1762d11c..f9445929b 100644 --- a/server/helpers/custom-validators/activitypub/misc.ts +++ b/server/helpers/custom-validators/activitypub/misc.ts
@@ -1,5 +1,5 @@
1	import * as validator from 'validator'	1	import * as validator from 'validator'
2	import { CONSTRAINTS_FIELDS } from '../../../initializers'	2	import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
3	import { isTestInstance } from '../../core-utils'	3	import { isTestInstance } from '../../core-utils'
4	import { exists } from '../misc'	4	import { exists } from '../misc'
5		5


diff --git a/server/helpers/custom-validators/activitypub/video-comments.ts b/server/helpers/custom-validators/activitypub/video-comments.ts index 0415db21c..26c8c4cc6 100644 --- a/server/helpers/custom-validators/activitypub/video-comments.ts +++ b/server/helpers/custom-validators/activitypub/video-comments.ts
@@ -1,7 +1,7 @@
1	import * as validator from 'validator'	1	import * as validator from 'validator'
2	import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers'	2	import { ACTIVITY_PUB } from '../../../initializers/constants'
3	import { exists, isArray, isDateValid } from '../misc'	3	import { exists, isArray, isDateValid } from '../misc'
4	import { isActivityPubUrlValid, isBaseActivityValid } from './misc'	4	import { isActivityPubUrlValid } from './misc'
5		5
6	function sanitizeAndCheckVideoCommentObject (comment: any) {	6	function sanitizeAndCheckVideoCommentObject (comment: any) {
7	if (!comment \|\| comment.type !== 'Note') return false	7	if (!comment \|\| comment.type !== 'Note') return false


diff --git a/server/helpers/custom-validators/activitypub/videos.ts b/server/helpers/custom-validators/activitypub/videos.ts index d94333151..3ba6b0744 100644 --- a/server/helpers/custom-validators/activitypub/videos.ts +++ b/server/helpers/custom-validators/activitypub/videos.ts
@@ -1,5 +1,5 @@
1	import * as validator from 'validator'	1	import * as validator from 'validator'
2	import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers'	2	import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers/constants'
3	import { peertubeTruncate } from '../../core-utils'	3	import { peertubeTruncate } from '../../core-utils'
4	import { exists, isArray, isBooleanValid, isDateValid, isUUIDValid } from '../misc'	4	import { exists, isArray, isBooleanValid, isDateValid, isUUIDValid } from '../misc'
5	import {	5	import {


diff --git a/server/helpers/custom-validators/servers.ts b/server/helpers/custom-validators/servers.ts index 18c80ec8f..5c8bf0d2d 100644 --- a/server/helpers/custom-validators/servers.ts +++ b/server/helpers/custom-validators/servers.ts
@@ -3,7 +3,7 @@ import 'express-validator'
3		3
4	import { isArray, exists } from './misc'	4	import { isArray, exists } from './misc'
5	import { isTestInstance } from '../core-utils'	5	import { isTestInstance } from '../core-utils'
6	import { CONSTRAINTS_FIELDS } from '../../initializers'	6	import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
7		7
8	function isHostValid (host: string) {	8	function isHostValid (host: string) {
9	const isURLOptions = {	9	const isURLOptions = {


diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts index 80652b479..70af5f1f0 100644 --- a/server/helpers/custom-validators/users.ts +++ b/server/helpers/custom-validators/users.ts
@@ -1,7 +1,7 @@
1	import 'express-validator'	1	import 'express-validator'
2	import * as validator from 'validator'	2	import * as validator from 'validator'
3	import { UserRole } from '../../../shared'	3	import { UserRole } from '../../../shared'
4	import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers'	4	import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants'
5	import { exists, isFileValid, isBooleanValid } from './misc'	5	import { exists, isFileValid, isBooleanValid } from './misc'
6	import { values } from 'lodash'	6	import { values } from 'lodash'
7		7


diff --git a/server/helpers/custom-validators/video-abuses.ts b/server/helpers/custom-validators/video-abuses.ts index 71500fde5..a61dcee1c 100644 --- a/server/helpers/custom-validators/video-abuses.ts +++ b/server/helpers/custom-validators/video-abuses.ts
@@ -1,6 +1,6 @@
1	import { Response } from 'express'	1	import { Response } from 'express'
2	import * as validator from 'validator'	2	import * as validator from 'validator'
3	import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers'	3	import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers/constants'
4	import { exists } from './misc'	4	import { exists } from './misc'
5	import { VideoAbuseModel } from '../../models/video/video-abuse'	5	import { VideoAbuseModel } from '../../models/video/video-abuse'
6		6


diff --git a/server/helpers/custom-validators/video-blacklist.ts b/server/helpers/custom-validators/video-blacklist.ts index 465f58a9c..3743f7023 100644 --- a/server/helpers/custom-validators/video-blacklist.ts +++ b/server/helpers/custom-validators/video-blacklist.ts
@@ -1,7 +1,7 @@
1	import { Response } from 'express'	1	import { Response } from 'express'
2	import * as validator from 'validator'	2	import * as validator from 'validator'
3	import { exists } from './misc'	3	import { exists } from './misc'
4	import { CONSTRAINTS_FIELDS } from '../../initializers'	4	import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
5	import { VideoBlacklistModel } from '../../models/video/video-blacklist'	5	import { VideoBlacklistModel } from '../../models/video/video-blacklist'
6	import { VideoBlacklistType } from '../../../shared/models/videos'	6	import { VideoBlacklistType } from '../../../shared/models/videos'
7		7


diff --git a/server/helpers/custom-validators/video-captions.ts b/server/helpers/custom-validators/video-captions.ts index 8bd139003..3b6569a8a 100644 --- a/server/helpers/custom-validators/video-captions.ts +++ b/server/helpers/custom-validators/video-captions.ts
@@ -1,4 +1,4 @@
1	import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_LANGUAGES } from '../../initializers'	1	import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_LANGUAGES } from '../../initializers/constants'
2	import { exists, isFileValid } from './misc'	2	import { exists, isFileValid } from './misc'
3	import { Response } from 'express'	3	import { Response } from 'express'
4	import { VideoModel } from '../../models/video/video'	4	import { VideoModel } from '../../models/video/video'


diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts index ca8d207cf..fd56b9a70 100644 --- a/server/helpers/custom-validators/video-channels.ts +++ b/server/helpers/custom-validators/video-channels.ts
@@ -2,7 +2,7 @@ import * as express from 'express'
2	import 'express-validator'	2	import 'express-validator'
3	import 'multer'	3	import 'multer'
4	import * as validator from 'validator'	4	import * as validator from 'validator'
5	import { CONSTRAINTS_FIELDS } from '../../initializers'	5	import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
6	import { VideoChannelModel } from '../../models/video/video-channel'	6	import { VideoChannelModel } from '../../models/video/video-channel'
7	import { exists } from './misc'	7	import { exists } from './misc'
8		8


diff --git a/server/helpers/custom-validators/video-comments.ts b/server/helpers/custom-validators/video-comments.ts index 2b3f66063..0707e2af2 100644 --- a/server/helpers/custom-validators/video-comments.ts +++ b/server/helpers/custom-validators/video-comments.ts
@@ -1,7 +1,7 @@
1	import 'express-validator'	1	import 'express-validator'
2	import 'multer'	2	import 'multer'
3	import * as validator from 'validator'	3	import * as validator from 'validator'
4	import { CONSTRAINTS_FIELDS } from '../../initializers'	4	import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
5		5
6	const VIDEO_COMMENTS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_COMMENTS	6	const VIDEO_COMMENTS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_COMMENTS
7		7


diff --git a/server/helpers/custom-validators/video-imports.ts b/server/helpers/custom-validators/video-imports.ts index 14db9b534..f4235e2fa 100644 --- a/server/helpers/custom-validators/video-imports.ts +++ b/server/helpers/custom-validators/video-imports.ts
@@ -1,7 +1,7 @@
1	import 'express-validator'	1	import 'express-validator'
2	import 'multer'	2	import 'multer'
3	import * as validator from 'validator'	3	import * as validator from 'validator'
4	import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_IMPORT_STATES } from '../../initializers'	4	import { CONSTRAINTS_FIELDS, MIMETYPES, VIDEO_IMPORT_STATES } from '../../initializers/constants'
5	import { exists, isFileValid } from './misc'	5	import { exists, isFileValid } from './misc'
6	import * as express from 'express'	6	import * as express from 'express'
7	import { VideoImportModel } from '../../models/video/video-import'	7	import { VideoImportModel } from '../../models/video/video-import'


diff --git a/server/helpers/custom-validators/video-playlists.ts b/server/helpers/custom-validators/video-playlists.ts index c962c5532..2fe426560 100644 --- a/server/helpers/custom-validators/video-playlists.ts +++ b/server/helpers/custom-validators/video-playlists.ts
@@ -1,6 +1,6 @@
1	import { exists } from './misc'	1	import { exists } from './misc'
2	import * as validator from 'validator'	2	import * as validator from 'validator'
3	import { CONSTRAINTS_FIELDS, VIDEO_PLAYLIST_PRIVACIES, VIDEO_PLAYLIST_TYPES } from '../../initializers'	3	import { CONSTRAINTS_FIELDS, VIDEO_PLAYLIST_PRIVACIES, VIDEO_PLAYLIST_TYPES } from '../../initializers/constants'
4	import * as express from 'express'	4	import * as express from 'express'
5	import { VideoPlaylistModel } from '../../models/video/video-playlist'	5	import { VideoPlaylistModel } from '../../models/video/video-playlist'
6		6


diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index dd9d62d24..eb08ae4ad 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts
@@ -11,7 +11,7 @@ import {
11	VIDEO_PRIVACIES,	11	VIDEO_PRIVACIES,
12	VIDEO_RATE_TYPES,	12	VIDEO_RATE_TYPES,
13	VIDEO_STATES	13	VIDEO_STATES
14	} from '../../initializers'	14	} from '../../initializers/constants'
15	import { VideoModel } from '../../models/video/video'	15	import { VideoModel } from '../../models/video/video'
16	import { exists, isArray, isDateValid, isFileValid } from './misc'	16	import { exists, isArray, isDateValid, isFileValid } from './misc'
17	import { VideoChannelModel } from '../../models/video/video-channel'	17	import { VideoChannelModel } from '../../models/video/video-channel'


diff --git a/server/helpers/custom-validators/webfinger.ts b/server/helpers/custom-validators/webfinger.ts index b18e43fad..dd914341e 100644 --- a/server/helpers/custom-validators/webfinger.ts +++ b/server/helpers/custom-validators/webfinger.ts
@@ -1,4 +1,4 @@
1	import { REMOTE_SCHEME, WEBSERVER } from '../../initializers'	1	import { REMOTE_SCHEME, WEBSERVER } from '../../initializers/constants'
2	import { sanitizeHost } from '../core-utils'	2	import { sanitizeHost } from '../core-utils'
3	import { exists } from './misc'	3	import { exists } from './misc'
4		4