5 files changed, 9 insertions, 11 deletions

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/misc.ts b/server/helpers/custom-validators/misc.ts
index c19a3e5eb..81a60ee66 100644
--- a/server/helpers/custom-validators/misc.ts
+++ b/server/helpers/custom-validators/misc.ts
@@ -2,7 +2,7 @@ import 'multer'
 import { UploadFilesForCheck } from 'express'
 import { sep } from 'path'
 import validator from 'validator'
-import { isShortUUID, shortToUUID } from '../uuid'
+import { isShortUUID, shortToUUID } from '@shared/extra-utils'
 
 function exists (value: any) {
   return value !== undefined && value !== null
diff --git a/server/helpers/custom-validators/plugins.ts b/server/helpers/custom-validators/plugins.ts
index f2d4efb32..60b29dc89 100644
--- a/server/helpers/custom-validators/plugins.ts
+++ b/server/helpers/custom-validators/plugins.ts
@@ -2,7 +2,7 @@ import { exists, isArray, isSafePath } from './misc'
 import validator from 'validator'
 import { PluginType } from '../../../shared/models/plugins/plugin.type'
 import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
-import { PluginPackageJson } from '../../../shared/models/plugins/plugin-package-json.model'
+import { PluginPackageJSON } from '../../../shared/models/plugins/plugin-package-json.model'
 import { isUrlValid } from './activitypub/misc'
 
 const PLUGINS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.PLUGINS
@@ -84,7 +84,7 @@ function isThemeNameValid (name: string) {
   return isPluginNameValid(name)
 }
 
-function isPackageJSONValid (packageJSON: PluginPackageJson, pluginType: PluginType) {
+function isPackageJSONValid (packageJSON: PluginPackageJSON, pluginType: PluginType) {
   let result = true
   const badFields: string[] = []
 
diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts
index f52c60b60..b04970108 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'
@@ -49,7 +49,7 @@ function isUserNSFWPolicyValid (value: any) {
   return exists(value) && nsfwPolicies.includes(value)
 }
 
-function isUserWebTorrentEnabledValid (value: any) {
+function isUserP2PEnabledValid (value: any) {
   return isBooleanValid(value)
 }
 
@@ -90,7 +90,7 @@ function isUserBlockedReasonValid (value: any) {
 }
 
 function isUserRoleValid (value: any) {
-  return exists(value) && validator.isInt('' + value) && UserRole[value] !== undefined
+  return exists(value) && validator.isInt('' + value) && [ UserRole.ADMINISTRATOR, UserRole.MODERATOR, UserRole.USER ].includes(value)
 }
 
 // ---------------------------------------------------------------------------
@@ -109,7 +109,7 @@ export {
   isUserAdminFlagsValid,
   isUserEmailVerifiedValid,
   isUserNSFWPolicyValid,
-  isUserWebTorrentEnabledValid,
+  isUserP2PEnabledValid,
   isUserAutoPlayVideoValid,
   isUserAutoPlayNextVideoValid,
   isUserAutoPlayNextVideoPlaylistValid,
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,