]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/blobdiff - server/controllers/api/v1/videos.js
reqValidators --> validators
[github/Chocobozzz/PeerTube.git] / server / controllers / api / v1 / videos.js
index 83734b35e7581f55481a1a009ae07acbe4c747ea..a37e9278e30576e78a4b19e7865cb50e5b12218c 100644 (file)
@@ -9,12 +9,12 @@ const multer = require('multer')
 const logger = require('../../../helpers/logger')
 const friends = require('../../../lib/friends')
 const middlewares = require('../../../middlewares')
-const oAuth2 = middlewares.oauth2
+const oAuth = middlewares.oauth
 const pagination = middlewares.pagination
-const reqValidator = middlewares.reqValidators
-const reqValidatorPagination = reqValidator.pagination
-const reqValidatorSort = reqValidator.sort
-const reqValidatorVideos = reqValidator.videos
+const validators = middlewares.validators
+const validatorsPagination = validators.pagination
+const validatorsSort = validators.sort
+const validatorsVideos = validators.videos
 const search = middlewares.search
 const sort = middlewares.sort
 const utils = require('../../../helpers/utils')
@@ -44,31 +44,31 @@ const storage = multer.diskStorage({
 const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
 
 router.get('/',
-  reqValidatorPagination.pagination,
-  reqValidatorSort.videosSort,
+  validatorsPagination.pagination,
+  validatorsSort.videosSort,
   sort.setVideosSort,
   pagination.setPagination,
   listVideos
 )
 router.post('/',
-  oAuth2.authenticate,
+  oAuth.authenticate,
   reqFiles,
-  reqValidatorVideos.videosAdd,
+  validatorsVideos.videosAdd,
   addVideo
 )
 router.get('/:id',
-  reqValidatorVideos.videosGet,
+  validatorsVideos.videosGet,
   getVideo
 )
 router.delete('/:id',
-  oAuth2.authenticate,
-  reqValidatorVideos.videosRemove,
+  oAuth.authenticate,
+  validatorsVideos.videosRemove,
   removeVideo
 )
 router.get('/search/:value',
-  reqValidatorVideos.videosSearch,
-  reqValidatorPagination.pagination,
-  reqValidatorSort.videosSort,
+  validatorsVideos.videosSearch,
+  validatorsPagination.pagination,
+  validatorsSort.videosSort,
   sort.setVideosSort,
   pagination.setPagination,
   search.setVideosSearch,
@@ -90,7 +90,7 @@ function addVideo (req, res, next) {
     function insertIntoDB (callback) {
       const videoData = {
         name: videoInfos.name,
-        namePath: videoFile.filename,
+        filename: videoFile.filename,
         description: videoInfos.description,
         author: res.locals.oauth.token.user.username,
         duration: videoFile.duration,