From d17c7b4e8c52317bdc874917387b7a49f6cf8b01 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 24 Dec 2021 10:14:47 +0100
Subject: Fix shared imports

---
 server/helpers/audit-logger.ts                           | 4 +---
 server/helpers/custom-validators/activitypub/playlist.ts | 3 +--
 server/helpers/custom-validators/users.ts                | 2 +-
 server/helpers/custom-validators/videos.ts               | 3 +--
 server/helpers/utils.ts                                  | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'server/helpers')

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'
 import { join } from 'path'
 import { addColors, config, createLogger, format, transports } from 'winston'
 import { AUDIT_LOG_FILENAME } from '@server/initializers/constants'
-import { AdminAbuse, User, VideoChannel, VideoDetails, VideoImport } from '../../shared'
-import { CustomConfig } from '../../shared/models/server/custom-config.model'
-import { VideoComment } from '../../shared/models/videos/comment/video-comment.model'
+import { AdminAbuse, CustomConfig, User, VideoChannel, VideoComment, VideoDetails, VideoImport } from '@shared/models'
 import { CONFIG } from '../initializers/config'
 import { jsonLoggerFormat, labelFormatter } from './logger'
 
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 @@
 import validator from 'validator'
-import { PlaylistElementObject } from '../../../../shared/models/activitypub/objects/playlist-element-object'
-import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
+import { PlaylistElementObject, PlaylistObject } from '@shared/models'
 import { exists, isDateValid, isUUIDValid } from '../misc'
 import { isVideoPlaylistNameValid } from '../video-playlists'
 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 @@
 import { values } from 'lodash'
 import validator from 'validator'
-import { UserRole } from '../../../shared'
+import { UserRole } from '@shared/models'
 import { isEmailEnabled } from '../../initializers/config'
 import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants'
 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'
 import { values } from 'lodash'
 import magnetUtil from 'magnet-uri'
 import validator from 'validator'
-import { VideoInclude } from '@shared/models'
-import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared'
+import { VideoFilter, VideoInclude, VideoPrivacy, VideoRateType } from '@shared/models'
 import {
   CONSTRAINTS_FIELDS,
   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'
 import { Instance as ParseTorrent } from 'parse-torrent'
 import { join } from 'path'
 import { sha256 } from '@shared/extra-utils'
-import { ResultList } from '../../shared'
+import { ResultList } from '@shared/models'
 import { CONFIG } from '../initializers/config'
 import { execPromise, execPromise2, randomBytesPromise } from './core-utils'
 import { logger } from './logger'
-- 
cgit v1.2.3