X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fvideo-channels.ts;h=ded5d517147dd952bbda0955e9e0db0820f9041a;hb=4024c44f9027a32809931de0692d40d001df721c;hp=3de9f041be57de1ae6395725ee9151637dab4367;hpb=a2431b7dcbc72c05101dcdbe631ff84a823aeb51;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts
index 3de9f041b..ded5d5171 100644
--- 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, database as db } from '../../initializers'
-import { VideoChannelInstance } from '../../models'
+import validator from 'validator'
+import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 import { exists } from './misc'
 
 const VIDEO_CHANNELS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_CHANNELS
@@ -16,24 +12,8 @@ function isVideoChannelNameValid (value: string) {
   return exists(value) && validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.NAME)
 }
 
-async function isVideoChannelExist (id: string, res: express.Response) {
-  let videoChannel: VideoChannelInstance
-  if (validator.isInt(id)) {
-    videoChannel = await db.VideoChannel.loadAndPopulateAccount(+id)
-  } else { // UUID
-    videoChannel = await db.VideoChannel.loadByUUIDAndPopulateAccount(id)
-  }
-
-  if (!videoChannel) {
-    res.status(404)
-      .json({ error: 'Video channel not found' })
-      .end()
-
-    return false
-  }
-
-  res.locals.videoChannel = videoChannel
-  return true
+function isVideoChannelSupportValid (value: string) {
+  return value === null || (exists(value) && validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.SUPPORT))
 }
 
 // ---------------------------------------------------------------------------
@@ -41,5 +21,5 @@ async function isVideoChannelExist (id: string, res: express.Response) {
 export {
   isVideoChannelDescriptionValid,
   isVideoChannelNameValid,
-  isVideoChannelExist
+  isVideoChannelSupportValid
 }