aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/audit-logger.ts4
-rw-r--r--server/helpers/custom-validators/activitypub/playlist.ts3
-rw-r--r--server/helpers/custom-validators/users.ts2
-rw-r--r--server/helpers/custom-validators/videos.ts3
-rw-r--r--server/helpers/utils.ts2
5 files changed, 5 insertions, 9 deletions
diff --git a/server/helpers/audit-logger.ts b/server/helpers/audit-logger.ts
index 5f2e870e3..79ef44be1 100644
--- a/server/helpers/audit-logger.ts
+++ b/server/helpers/audit-logger.ts
@@ -5,9 +5,7 @@ import { chain } from 'lodash'
5import { join } from 'path' 5import { join } from 'path'
6import { addColors, config, createLogger, format, transports } from 'winston' 6import { addColors, config, createLogger, format, transports } from 'winston'
7import { AUDIT_LOG_FILENAME } from '@server/initializers/constants' 7import { AUDIT_LOG_FILENAME } from '@server/initializers/constants'
8import { AdminAbuse, User, VideoChannel, VideoDetails, VideoImport } from '../../shared' 8import { AdminAbuse, CustomConfig, User, VideoChannel, VideoComment, VideoDetails, VideoImport } from '@shared/models'
9import { CustomConfig } from '../../shared/models/server/custom-config.model'
10import { VideoComment } from '../../shared/models/videos/comment/video-comment.model'
11import { CONFIG } from '../initializers/config' 9import { CONFIG } from '../initializers/config'
12import { jsonLoggerFormat, labelFormatter } from './logger' 10import { jsonLoggerFormat, labelFormatter } from './logger'
13 11
diff --git a/server/helpers/custom-validators/activitypub/playlist.ts b/server/helpers/custom-validators/activitypub/playlist.ts
index 72c5b80e9..49bcadcfd 100644
--- a/server/helpers/custom-validators/activitypub/playlist.ts
+++ b/server/helpers/custom-validators/activitypub/playlist.ts
@@ -1,6 +1,5 @@
1import validator from 'validator' 1import validator from 'validator'
2import { PlaylistElementObject } from '../../../../shared/models/activitypub/objects/playlist-element-object' 2import { PlaylistElementObject, PlaylistObject } from '@shared/models'
3import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
4import { exists, isDateValid, isUUIDValid } from '../misc' 3import { exists, isDateValid, isUUIDValid } from '../misc'
5import { isVideoPlaylistNameValid } from '../video-playlists' 4import { isVideoPlaylistNameValid } from '../video-playlists'
6import { isActivityPubUrlValid } from './misc' 5import { isActivityPubUrlValid } from './misc'
diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts
index badf171d2..105c36600 100644
--- a/server/helpers/custom-validators/users.ts
+++ b/server/helpers/custom-validators/users.ts
@@ -1,6 +1,6 @@
1import { values } from 'lodash' 1import { values } from 'lodash'
2import validator from 'validator' 2import validator from 'validator'
3import { UserRole } from '../../../shared' 3import { UserRole } from '@shared/models'
4import { isEmailEnabled } from '../../initializers/config' 4import { isEmailEnabled } from '../../initializers/config'
5import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants' 5import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants'
6import { exists, isArray, isBooleanValid } from './misc' 6import { exists, isArray, isBooleanValid } from './misc'
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index 1d56ade6f..e526c4284 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -2,8 +2,7 @@ import { UploadFilesForCheck } from 'express'
2import { values } from 'lodash' 2import { values } from 'lodash'
3import magnetUtil from 'magnet-uri' 3import magnetUtil from 'magnet-uri'
4import validator from 'validator' 4import validator from 'validator'
5import { VideoInclude } from '@shared/models' 5import { VideoFilter, VideoInclude, VideoPrivacy, VideoRateType } from '@shared/models'
6import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared'
7import { 6import {
8 CONSTRAINTS_FIELDS, 7 CONSTRAINTS_FIELDS,
9 MIMETYPES, 8 MIMETYPES,
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index bd85eaa56..6b9333b53 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -2,7 +2,7 @@ import { remove } from 'fs-extra'
2import { Instance as ParseTorrent } from 'parse-torrent' 2import { Instance as ParseTorrent } from 'parse-torrent'
3import { join } from 'path' 3import { join } from 'path'
4import { sha256 } from '@shared/extra-utils' 4import { sha256 } from '@shared/extra-utils'
5import { ResultList } from '../../shared' 5import { ResultList } from '@shared/models'
6import { CONFIG } from '../initializers/config' 6import { CONFIG } from '../initializers/config'
7import { execPromise, execPromise2, randomBytesPromise } from './core-utils' 7import { execPromise, execPromise2, randomBytesPromise } from './core-utils'
8import { logger } from './logger' 8import { logger } from './logger'