Merge branch 'release/3.1.0' into develop

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / video-channels.ts

diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts
index 2a6f56840c4e8fe9e76345b4bf3c579a3a2a352b..ded5d517147dd952bbda0955e9e0db0820f9041a 100644 (file)
--- a/server/helpers/custom-validators/video-channels.ts
+++ b/server/helpers/custom-validators/video-channels.ts
@@ -1,9 +1,5 @@
-import * as express from 'express'
-import 'express-validator'
-import 'multer'
-import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS } from '../../initializers'
-import { VideoChannelModel } from '../../models/video/video-channel'
+import validator from 'validator'
+import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 import { exists } from './misc'
 
 const VIDEO_CHANNELS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_CHANNELS
@@ -20,31 +16,10 @@ function isVideoChannelSupportValid (value: string) {
   return value === null || (exists(value) && validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.SUPPORT))
 }
 
-async function isVideoChannelExist (id: string, res: express.Response) {
-  let videoChannel: VideoChannelModel
-  if (validator.isInt(id)) {
-    videoChannel = await VideoChannelModel.loadAndPopulateAccount(+id)
-  } else { // UUID
-    videoChannel = await VideoChannelModel.loadByUUIDAndPopulateAccount(id)
-  }
-
-  if (!videoChannel) {
-    res.status(404)
-      .json({ error: 'Video channel not found' })
-      .end()
-
-    return false
-  }
-
-  res.locals.videoChannel = videoChannel
-  return true
-}
-
 // ---------------------------------------------------------------------------
 
 export {
   isVideoChannelDescriptionValid,
   isVideoChannelNameValid,
-  isVideoChannelSupportValid,
-  isVideoChannelExist
+  isVideoChannelSupportValid
 }