diff options
Diffstat (limited to 'server/helpers')
-rw-r--r-- | server/helpers/audit-logger.ts | 4 | ||||
-rw-r--r-- | server/helpers/custom-validators/activitypub/playlist.ts | 3 | ||||
-rw-r--r-- | server/helpers/custom-validators/users.ts | 2 | ||||
-rw-r--r-- | server/helpers/custom-validators/videos.ts | 3 | ||||
-rw-r--r-- | server/helpers/utils.ts | 2 |
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' | |||
5 | import { join } from 'path' | 5 | import { join } from 'path' |
6 | import { addColors, config, createLogger, format, transports } from 'winston' | 6 | import { addColors, config, createLogger, format, transports } from 'winston' |
7 | import { AUDIT_LOG_FILENAME } from '@server/initializers/constants' | 7 | import { AUDIT_LOG_FILENAME } from '@server/initializers/constants' |
8 | import { AdminAbuse, User, VideoChannel, VideoDetails, VideoImport } from '../../shared' | 8 | import { AdminAbuse, CustomConfig, User, VideoChannel, VideoComment, VideoDetails, VideoImport } from '@shared/models' |
9 | import { CustomConfig } from '../../shared/models/server/custom-config.model' | ||
10 | import { VideoComment } from '../../shared/models/videos/comment/video-comment.model' | ||
11 | import { CONFIG } from '../initializers/config' | 9 | import { CONFIG } from '../initializers/config' |
12 | import { jsonLoggerFormat, labelFormatter } from './logger' | 10 | import { 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 @@ | |||
1 | import validator from 'validator' | 1 | import validator from 'validator' |
2 | import { PlaylistElementObject } from '../../../../shared/models/activitypub/objects/playlist-element-object' | 2 | import { PlaylistElementObject, PlaylistObject } from '@shared/models' |
3 | import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object' | ||
4 | import { exists, isDateValid, isUUIDValid } from '../misc' | 3 | import { exists, isDateValid, isUUIDValid } from '../misc' |
5 | import { isVideoPlaylistNameValid } from '../video-playlists' | 4 | import { isVideoPlaylistNameValid } from '../video-playlists' |
6 | import { isActivityPubUrlValid } from './misc' | 5 | import { 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 @@ | |||
1 | import { values } from 'lodash' | 1 | import { values } from 'lodash' |
2 | import validator from 'validator' | 2 | import validator from 'validator' |
3 | import { UserRole } from '../../../shared' | 3 | import { UserRole } from '@shared/models' |
4 | import { isEmailEnabled } from '../../initializers/config' | 4 | import { isEmailEnabled } from '../../initializers/config' |
5 | import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants' | 5 | import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants' |
6 | import { exists, isArray, isBooleanValid } from './misc' | 6 | import { 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' | |||
2 | import { values } from 'lodash' | 2 | import { values } from 'lodash' |
3 | import magnetUtil from 'magnet-uri' | 3 | import magnetUtil from 'magnet-uri' |
4 | import validator from 'validator' | 4 | import validator from 'validator' |
5 | import { VideoInclude } from '@shared/models' | 5 | import { VideoFilter, VideoInclude, VideoPrivacy, VideoRateType } from '@shared/models' |
6 | import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared' | ||
7 | import { | 6 | import { |
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' | |||
2 | import { Instance as ParseTorrent } from 'parse-torrent' | 2 | import { Instance as ParseTorrent } from 'parse-torrent' |
3 | import { join } from 'path' | 3 | import { join } from 'path' |
4 | import { sha256 } from '@shared/extra-utils' | 4 | import { sha256 } from '@shared/extra-utils' |
5 | import { ResultList } from '../../shared' | 5 | import { ResultList } from '@shared/models' |
6 | import { CONFIG } from '../initializers/config' | 6 | import { CONFIG } from '../initializers/config' |
7 | import { execPromise, execPromise2, randomBytesPromise } from './core-utils' | 7 | import { execPromise, execPromise2, randomBytesPromise } from './core-utils' |
8 | import { logger } from './logger' | 8 | import { logger } from './logger' |