X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fvideo-channels.ts;h=2a6f56840c4e8fe9e76345b4bf3c579a3a2a352b;hb=40e87e9ecc54e3513fb586928330a7855eb192c6;hp=5de01f74b4ddbf34fd6cbc0b81b9726930e83a9b;hpb=8d468a16fd33ec2660c3c59b3f7def53eb0cc4a1;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts
index 5de01f74b..2a6f56840 100644
--- a/server/helpers/custom-validators/video-channels.ts
+++ b/server/helpers/custom-validators/video-channels.ts
@@ -1,21 +1,13 @@
-import * as Promise from 'bluebird'
-import * as validator from 'validator'
 import * as express from 'express'
 import 'express-validator'
 import 'multer'
-
-import { database as db, CONSTRAINTS_FIELDS } from '../../initializers'
-import { VideoChannelInstance } from '../../models'
-import { logger } from '../logger'
+import * as validator from 'validator'
+import { CONSTRAINTS_FIELDS } from '../../initializers'
+import { VideoChannelModel } from '../../models/video/video-channel'
 import { exists } from './misc'
-import { isActivityPubUrlValid } from './index'
 
 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,28 +16,28 @@ 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: Promise<VideoChannelInstance>
+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)) {
-    promise = db.VideoChannel.loadAndPopulateAccount(+id)
+    videoChannel = await VideoChannelModel.loadAndPopulateAccount(+id)
   } else { // UUID
-    promise = db.VideoChannel.loadByUUIDAndPopulateAccount(id)
+    videoChannel = await VideoChannelModel.loadByUUIDAndPopulateAccount(id)
+  }
+
+  if (!videoChannel) {
+    res.status(404)
+      .json({ error: 'Video channel not found' })
+      .end()
+
+    return false
   }
 
-  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)
-    })
+  res.locals.videoChannel = videoChannel
+  return true
 }
 
 // ---------------------------------------------------------------------------
@@ -53,6 +45,6 @@ function checkVideoChannelExists (id: string, res: express.Response, callback: (
 export {
   isVideoChannelDescriptionValid,
   isVideoChannelNameValid,
-  checkVideoChannelExists,
-  isVideoChannelUrlValid
+  isVideoChannelSupportValid,
+  isVideoChannelExist
 }