Propagate old comment on new follow

[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 b6be557e622d1915fa02f546f1108af48d769ee1..6bc96bf51bbdb3d0028c494217b0281023b533a0 100644 (file)
--- a/server/helpers/custom-validators/video-channels.ts
+++ b/server/helpers/custom-validators/video-channels.ts
@@ -1,12 +1,9 @@
-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'
 
 const VIDEO_CHANNELS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_CHANNELS
@@ -19,32 +16,24 @@ function isVideoChannelNameValid (value: string) {
   return exists(value) && validator.isLength(value, VIDEO_CHANNELS_CONSTRAINTS_FIELDS.NAME)
 }
 
-function isVideoChannelUUIDValid (value: string) {
-  return exists(value) && validator.isUUID('' + value, 4)
-}
-
-function checkVideoChannelExists (id: string, res: express.Response, callback: () => void) {
-  let promise: Promise<VideoChannelInstance>
+async function isVideoChannelExist (id: string, res: express.Response) {
+  let videoChannel: VideoChannelModel
   if (validator.isInt(id)) {
-    promise = db.VideoChannel.loadAndPopulateAuthor(+id)
+    videoChannel = await VideoChannelModel.loadAndPopulateAccount(+id)
   } else { // UUID
-    promise = db.VideoChannel.loadByUUIDAndPopulateAuthor(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
 }
 
 // ---------------------------------------------------------------------------
@@ -52,6 +41,5 @@ function checkVideoChannelExists (id: string, res: express.Response, callback: (
 export {
   isVideoChannelDescriptionValid,
   isVideoChannelNameValid,
-  isVideoChannelUUIDValid,
-  checkVideoChannelExists
+  isVideoChannelExist
 }