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 267d987fc658f22c10b9378b077860eb1dabf01a..ded5d517147dd952bbda0955e9e0db0820f9041a 100644 (file)
--- a/server/helpers/custom-validators/video-channels.ts
+++ b/server/helpers/custom-validators/video-channels.ts
@@ -1,21 +1,9 @@
-import * as Bluebird from 'bluebird'
-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 { logger } from '../logger'
-import { isActivityPubUrlValid } from './index'
+import validator from 'validator'
+import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
 import { exists } from './misc'
 
 const VIDEO_CHANNELS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_CHANNELS
 
-function isVideoChannelUrlValid (value: string) {
-  return isActivityPubUrlValid(value)
-}
-
 function isVideoChannelDescriptionValid (value: string) {
   return value === null || validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.DESCRIPTION)
 }
@@ -24,56 +12,14 @@ function isVideoChannelNameValid (value: string) {
   return exists(value) && validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.NAME)
 }
 
-function checkVideoChannelExists (id: string, res: express.Response, callback: () => void) {
-  let promise: Bluebird<VideoChannelInstance>
-  if (validator.isInt(id)) {
-    promise = db.VideoChannel.loadAndPopulateAccount(+id)
-  } else { // UUID
-    promise = db.VideoChannel.loadByUUIDAndPopulateAccount(id)
-  }
-
-  promise.then(videoChannel => {
-    if (!videoChannel) {
-      return res.status(404)
-        .json({ error: 'Video channel not found' })
-        .end()
-    }
-
-    res.locals.videoChannel = videoChannel
-    callback()
-  })
-    .catch(err => {
-      logger.error('Error in video channel request validator.', err)
-      return res.sendStatus(500)
-    })
-}
-
-async function isVideoChannelExistsPromise (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))
 }
 
 // ---------------------------------------------------------------------------
 
 export {
   isVideoChannelDescriptionValid,
-  checkVideoChannelExists,
   isVideoChannelNameValid,
-  isVideoChannelExistsPromise,
-  isVideoChannelUrlValid
+  isVideoChannelSupportValid
 }