4 files changed, 205 insertions, 166 deletions

diff --git a/server/controllers/api/videos/abuse.js b/server/controllers/api/videos/abuse.ts
index 0fb44bb14..88204120f 100644
--- a/server/controllers/api/videos/abuse.js
+++ b/server/controllers/api/videos/abuse.ts
@@ -1,43 +1,48 @@
-'use strict'
-
-const express = require('express')
-const waterfall = require('async/waterfall')
+import express = require('express')
+import { waterfall } from 'async'
 
 const db = require('../../../initializers/database')
-const logger = require('../../../helpers/logger')
-const friends = require('../../../lib/friends')
-const middlewares = require('../../../middlewares')
-const admin = middlewares.admin
-const oAuth = middlewares.oauth
-const pagination = middlewares.pagination
-const validators = middlewares.validators
-const validatorsPagination = validators.pagination
-const validatorsSort = validators.sort
-const validatorsVideos = validators.videos
-const sort = middlewares.sort
-const databaseUtils = require('../../../helpers/database-utils')
-const utils = require('../../../helpers/utils')
-
-const router = express.Router()
-
-router.get('/abuse',
-  oAuth.authenticate,
-  admin.ensureIsAdmin,
-  validatorsPagination.pagination,
-  validatorsSort.videoAbusesSort,
-  sort.setVideoAbusesSort,
-  pagination.setPagination,
+import friends = require('../../../lib/friends')
+import {
+  logger,
+  getFormatedObjects,
+  retryTransactionWrapper,
+  startSerializableTransaction,
+  commitTransaction,
+  rollbackTransaction
+} from '../../../helpers'
+import {
+  authenticate,
+  ensureIsAdmin,
+  paginationValidator,
+  videoAbuseReportValidator,
+  videoAbusesSortValidator,
+  setVideoAbusesSort,
+  setPagination
+} from '../../../middlewares'
+
+const abuseVideoRouter = express.Router()
+
+abuseVideoRouter.get('/abuse',
+  authenticate,
+  ensureIsAdmin,
+  paginationValidator,
+  videoAbusesSortValidator,
+  setVideoAbusesSort,
+  setPagination,
   listVideoAbuses
 )
-router.post('/:id/abuse',
-  oAuth.authenticate,
-  validatorsVideos.videoAbuseReport,
+abuseVideoRouter.post('/:id/abuse',
+  authenticate,
+  videoAbuseReportValidator,
   reportVideoAbuseRetryWrapper
 )
 
 // ---------------------------------------------------------------------------
 
-module.exports = router
+export {
+  abuseVideoRouter
+}
 
 // ---------------------------------------------------------------------------
 
@@ -45,7 +50,7 @@ function listVideoAbuses (req, res, next) {
   db.VideoAbuse.listForApi(req.query.start, req.query.count, req.query.sort, function (err, abusesList, abusesTotal) {
     if (err) return next(err)
 
-    res.json(utils.getFormatedObjects(abusesList, abusesTotal))
+    res.json(getFormatedObjects(abusesList, abusesTotal))
   })
 }
 
@@ -55,7 +60,7 @@ function reportVideoAbuseRetryWrapper (req, res, next) {
     errorMessage: 'Cannot report abuse to the video with many retries.'
   }
 
-  databaseUtils.retryTransactionWrapper(reportVideoAbuse, options, function (err) {
+  retryTransactionWrapper(reportVideoAbuse, options, function (err) {
     if (err) return next(err)
 
     return res.type('json').status(204).end()
@@ -75,7 +80,7 @@ function reportVideoAbuse (req, res, finalCallback) {
 
   waterfall([
 
-    databaseUtils.startSerializableTransaction,
+    startSerializableTransaction,
 
     function createAbuse (t, callback) {
       db.VideoAbuse.create(abuse).asCallback(function (err, abuse) {
@@ -98,12 +103,12 @@ function reportVideoAbuse (req, res, finalCallback) {
       return callback(null, t)
     },
 
-    databaseUtils.commitTransaction
+    commitTransaction
 
   ], function andFinally (err, t) {
     if (err) {
       logger.debug('Cannot update the video.', { error: err })
-      return databaseUtils.rollbackTransaction(err, t, finalCallback)
+      return rollbackTransaction(err, t, finalCallback)
     }
 
     logger.info('Abuse report for video %s created.', videoInstance.name)
diff --git a/server/controllers/api/videos/blacklist.js b/server/controllers/api/videos/blacklist.ts
index 8c3e2a69d..db6d95e73 100644
--- a/server/controllers/api/videos/blacklist.js
+++ b/server/controllers/api/videos/blacklist.ts
@@ -1,27 +1,27 @@
-'use strict'
-
-const express = require('express')
+import express = require('express')
 
 const db = require('../../../initializers/database')
-const logger = require('../../../helpers/logger')
-const middlewares = require('../../../middlewares')
-const admin = middlewares.admin
-const oAuth = middlewares.oauth
-const validators = middlewares.validators
-const validatorsVideos = validators.videos
-
-const router = express.Router()
-
-router.post('/:id/blacklist',
-  oAuth.authenticate,
-  admin.ensureIsAdmin,
-  validatorsVideos.videosBlacklist,
+import { logger } from '../../../helpers'
+import {
+  authenticate,
+  ensureIsAdmin,
+  videosBlacklistValidator
+} from '../../../middlewares'
+
+const blacklistRouter = express.Router()
+
+blacklistRouter.post('/:id/blacklist',
+  authenticate,
+  ensureIsAdmin,
+  videosBlacklistValidator,
   addVideoToBlacklist
 )
 
 // ---------------------------------------------------------------------------
 
-module.exports = router
+export {
+  blacklistRouter
+}
 
 // ---------------------------------------------------------------------------
 
diff --git a/server/controllers/api/videos/index.js b/server/controllers/api/videos/index.ts
index 8de44d5ac..5fbf03676 100644
--- a/server/controllers/api/videos/index.js
+++ b/server/controllers/api/videos/index.ts
@@ -1,37 +1,57 @@
-'use strict'
+import express = require('express')
+import fs = require('fs')
+import multer = require('multer')
+import path = require('path')
+import { waterfall } from 'async'
 
-const express = require('express')
-const fs = require('fs')
-const multer = require('multer')
-const path = require('path')
-const waterfall = require('async/waterfall')
-
-const constants = require('../../../initializers/constants')
 const db = require('../../../initializers/database')
-const logger = require('../../../helpers/logger')
-const friends = require('../../../lib/friends')
-const middlewares = require('../../../middlewares')
-const oAuth = middlewares.oauth
-const pagination = middlewares.pagination
-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 databaseUtils = require('../../../helpers/database-utils')
-const utils = require('../../../helpers/utils')
-
-const abuseController = require('./abuse')
-const blacklistController = require('./blacklist')
-const rateController = require('./rate')
-
-const router = express.Router()
+import {
+  CONFIG,
+  REQUEST_VIDEO_QADU_TYPES,
+  REQUEST_VIDEO_EVENT_TYPES,
+  VIDEO_CATEGORIES,
+  VIDEO_LICENCES,
+  VIDEO_LANGUAGES
+} from '../../../initializers'
+import {
+  addEventToRemoteVideo,
+  quickAndDirtyUpdateVideoToFriends,
+  addVideoToFriends,
+  updateVideoToFriends
+} from '../../../lib'
+import {
+  authenticate,
+  paginationValidator,
+  videosSortValidator,
+  setVideosSort,
+  setPagination,
+  setVideosSearch,
+  videosUpdateValidator,
+  videosSearchValidator,
+  videosAddValidator,
+  videosGetValidator,
+  videosRemoveValidator
+} from '../../../middlewares'
+import {
+  logger,
+  commitTransaction,
+  retryTransactionWrapper,
+  rollbackTransaction,
+  startSerializableTransaction,
+  generateRandomString,
+  getFormatedObjects
+} from '../../../helpers'
+
+import { abuseVideoRouter } from './abuse'
+import { blacklistRouter } from './blacklist'
+import { rateVideoRouter } from './rate'
+
+const videosRouter = express.Router()
 
 // multer configuration
 const storage = multer.diskStorage({
   destination: function (req, file, cb) {
-    cb(null, constants.CONFIG.STORAGE.VIDEOS_DIR)
+    cb(null, CONFIG.STORAGE.VIDEOS_DIR)
   },
 
   filename: function (req, file, cb) {
@@ -39,7 +59,7 @@ const storage = multer.diskStorage({
     if (file.mimetype === 'video/webm') extension = 'webm'
     else if (file.mimetype === 'video/mp4') extension = 'mp4'
     else if (file.mimetype === 'video/ogg') extension = 'ogv'
-    utils.generateRandomString(16, function (err, randomString) {
+    generateRandomString(16, function (err, randomString) {
       const fieldname = err ? undefined : randomString
       cb(null, fieldname + '.' + extension)
     })
@@ -48,70 +68,72 @@ const storage = multer.diskStorage({
 
 const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
 
-router.use('/', abuseController)
-router.use('/', blacklistController)
-router.use('/', rateController)
+videosRouter.use('/', abuseVideoRouter)
+videosRouter.use('/', blacklistRouter)
+videosRouter.use('/', rateVideoRouter)
 
-router.get('/categories', listVideoCategories)
-router.get('/licences', listVideoLicences)
-router.get('/languages', listVideoLanguages)
+videosRouter.get('/categories', listVideoCategories)
+videosRouter.get('/licences', listVideoLicences)
+videosRouter.get('/languages', listVideoLanguages)
 
-router.get('/',
-  validatorsPagination.pagination,
-  validatorsSort.videosSort,
-  sort.setVideosSort,
-  pagination.setPagination,
+videosRouter.get('/',
+  paginationValidator,
+  videosSortValidator,
+  setVideosSort,
+  setPagination,
   listVideos
 )
-router.put('/:id',
-  oAuth.authenticate,
+videosRouter.put('/:id',
+  authenticate,
   reqFiles,
-  validatorsVideos.videosUpdate,
+  videosUpdateValidator,
   updateVideoRetryWrapper
 )
-router.post('/',
-  oAuth.authenticate,
+videosRouter.post('/',
+  authenticate,
   reqFiles,
-  validatorsVideos.videosAdd,
+  videosAddValidator,
   addVideoRetryWrapper
 )
-router.get('/:id',
-  validatorsVideos.videosGet,
+videosRouter.get('/:id',
+  videosGetValidator,
   getVideo
 )
 
-router.delete('/:id',
-  oAuth.authenticate,
-  validatorsVideos.videosRemove,
+videosRouter.delete('/:id',
+  authenticate,
+  videosRemoveValidator,
   removeVideo
 )
 
-router.get('/search/:value',
-  validatorsVideos.videosSearch,
-  validatorsPagination.pagination,
-  validatorsSort.videosSort,
-  sort.setVideosSort,
-  pagination.setPagination,
-  search.setVideosSearch,
+videosRouter.get('/search/:value',
+  videosSearchValidator,
+  paginationValidator,
+  videosSortValidator,
+  setVideosSort,
+  setPagination,
+  setVideosSearch,
   searchVideos
 )
 
 // ---------------------------------------------------------------------------
 
-module.exports = router
+export {
+  videosRouter
+}
 
 // ---------------------------------------------------------------------------
 
 function listVideoCategories (req, res, next) {
-  res.json(constants.VIDEO_CATEGORIES)
+  res.json(VIDEO_CATEGORIES)
 }
 
 function listVideoLicences (req, res, next) {
-  res.json(constants.VIDEO_LICENCES)
+  res.json(VIDEO_LICENCES)
 }
 
 function listVideoLanguages (req, res, next) {
-  res.json(constants.VIDEO_LANGUAGES)
+  res.json(VIDEO_LANGUAGES)
 }
 
 // Wrapper to video add that retry the function if there is a database error
@@ -122,7 +144,7 @@ function addVideoRetryWrapper (req, res, next) {
     errorMessage: 'Cannot insert the video with many retries.'
   }
 
-  databaseUtils.retryTransactionWrapper(addVideo, options, function (err) {
+  retryTransactionWrapper(addVideo, options, function (err) {
     if (err) return next(err)
 
     // TODO : include Location of the new video -> 201
@@ -135,7 +157,7 @@ function addVideo (req, res, videoFile, finalCallback) {
 
   waterfall([
 
-    databaseUtils.startSerializableTransaction,
+    startSerializableTransaction,
 
     function findOrCreateAuthor (t, callback) {
       const user = res.locals.oauth.token.User
@@ -179,7 +201,7 @@ function addVideo (req, res, videoFile, finalCallback) {
 
      // Set the videoname the same as the id
     function renameVideoFile (t, author, tagInstances, video, callback) {
-      const videoDir = constants.CONFIG.STORAGE.VIDEOS_DIR
+      const videoDir = CONFIG.STORAGE.VIDEOS_DIR
       const source = path.join(videoDir, videoFile.filename)
       const destination = path.join(videoDir, video.getVideoFilename())
 
@@ -218,25 +240,25 @@ function addVideo (req, res, videoFile, finalCallback) {
 
     function sendToFriends (t, video, callback) {
       // Let transcoding job send the video to friends because the videofile extension might change
-      if (constants.CONFIG.TRANSCODING.ENABLED === true) return callback(null, t)
+      if (CONFIG.TRANSCODING.ENABLED === true) return callback(null, t)
 
       video.toAddRemoteJSON(function (err, remoteVideo) {
         if (err) return callback(err)
 
         // Now we'll add the video's meta data to our friends
-        friends.addVideoToFriends(remoteVideo, t, function (err) {
+        addVideoToFriends(remoteVideo, t, function (err) {
           return callback(err, t)
         })
       })
     },
 
-    databaseUtils.commitTransaction
+    commitTransaction
 
   ], function andFinally (err, t) {
     if (err) {
       // This is just a debug because we will retry the insert
       logger.debug('Cannot insert the video.', { error: err })
-      return databaseUtils.rollbackTransaction(err, t, finalCallback)
+      return rollbackTransaction(err, t, finalCallback)
     }
 
     logger.info('Video with name %s created.', videoInfos.name)
@@ -250,7 +272,7 @@ function updateVideoRetryWrapper (req, res, next) {
     errorMessage: 'Cannot update the video with many retries.'
   }
 
-  databaseUtils.retryTransactionWrapper(updateVideo, options, function (err) {
+  retryTransactionWrapper(updateVideo, options, function (err) {
     if (err) return next(err)
 
     // TODO : include Location of the new video -> 201
@@ -265,7 +287,7 @@ function updateVideo (req, res, finalCallback) {
 
   waterfall([
 
-    databaseUtils.startSerializableTransaction,
+    startSerializableTransaction,
 
     function findOrCreateTags (t, callback) {
       if (videoInfosToUpdate.tags) {
@@ -312,12 +334,12 @@ function updateVideo (req, res, finalCallback) {
       const json = videoInstance.toUpdateRemoteJSON()
 
       // Now we'll update the video's meta data to our friends
-      friends.updateVideoToFriends(json, t, function (err) {
+      updateVideoToFriends(json, t, function (err) {
         return callback(err, t)
       })
     },
 
-    databaseUtils.commitTransaction
+    commitTransaction
 
   ], function andFinally (err, t) {
     if (err) {
@@ -331,7 +353,7 @@ function updateVideo (req, res, finalCallback) {
         videoInstance.set(key, value)
       })
 
-      return databaseUtils.rollbackTransaction(err, t, finalCallback)
+      return rollbackTransaction(err, t, finalCallback)
     }
 
     logger.info('Video with name %s updated.', videoInfosToUpdate.name)
@@ -354,17 +376,17 @@ function getVideo (req, res, next) {
       // For example, only add a view when a user watch a video during 30s etc
       const qaduParams = {
         videoId: videoInstance.id,
-        type: constants.REQUEST_VIDEO_QADU_TYPES.VIEWS
+        type: REQUEST_VIDEO_QADU_TYPES.VIEWS
       }
-      friends.quickAndDirtyUpdateVideoToFriends(qaduParams)
+      quickAndDirtyUpdateVideoToFriends(qaduParams)
     })
   } else {
     // Just send the event to our friends
     const eventParams = {
       videoId: videoInstance.id,
-      type: constants.REQUEST_VIDEO_EVENT_TYPES.VIEWS
+      type: REQUEST_VIDEO_EVENT_TYPES.VIEWS
     }
-    friends.addEventToRemoteVideo(eventParams)
+    addEventToRemoteVideo(eventParams)
   }
 
   // Do not wait the view system
@@ -375,7 +397,7 @@ function listVideos (req, res, next) {
   db.Video.listForApi(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) {
     if (err) return next(err)
 
-    res.json(utils.getFormatedObjects(videosList, videosTotal))
+    res.json(getFormatedObjects(videosList, videosTotal))
   })
 }
 
@@ -398,7 +420,7 @@ function searchVideos (req, res, next) {
     function (err, videosList, videosTotal) {
       if (err) return next(err)
 
-      res.json(utils.getFormatedObjects(videosList, videosTotal))
+      res.json(getFormatedObjects(videosList, videosTotal))
     }
   )
 }
diff --git a/server/controllers/api/videos/rate.js b/server/controllers/api/videos/rate.ts
index df8a69a1d..21053792a 100644
--- a/server/controllers/api/videos/rate.js
+++ b/server/controllers/api/videos/rate.ts
@@ -1,29 +1,41 @@
-'use strict'
+import express = require('express')
+import { waterfall } from 'async'
 
-const express = require('express')
-const waterfall = require('async/waterfall')
-
-const constants = require('../../../initializers/constants')
 const db = require('../../../initializers/database')
-const logger = require('../../../helpers/logger')
-const friends = require('../../../lib/friends')
-const middlewares = require('../../../middlewares')
-const oAuth = middlewares.oauth
-const validators = middlewares.validators
-const validatorsVideos = validators.videos
-const databaseUtils = require('../../../helpers/database-utils')
-
-const router = express.Router()
-
-router.put('/:id/rate',
-  oAuth.authenticate,
-  validatorsVideos.videoRate,
+import {
+  logger,
+  retryTransactionWrapper,
+  startSerializableTransaction,
+  commitTransaction,
+  rollbackTransaction
+} from '../../../helpers'
+import {
+  VIDEO_RATE_TYPES,
+  REQUEST_VIDEO_EVENT_TYPES,
+  REQUEST_VIDEO_QADU_TYPES
+} from '../../../initializers'
+import {
+  addEventsToRemoteVideo,
+  quickAndDirtyUpdatesVideoToFriends
+} from '../../../lib'
+import {
+  authenticate,
+  videoRateValidator
+} from '../../../middlewares'
+
+const rateVideoRouter = express.Router()
+
+rateVideoRouter.put('/:id/rate',
+  authenticate,
+  videoRateValidator,
   rateVideoRetryWrapper
 )
 
 // ---------------------------------------------------------------------------
 
-module.exports = router
+export {
+  rateVideoRouter
+}
 
 // ---------------------------------------------------------------------------
 
@@ -33,7 +45,7 @@ function rateVideoRetryWrapper (req, res, next) {
     errorMessage: 'Cannot update the user video rate.'
   }
 
-  databaseUtils.retryTransactionWrapper(rateVideo, options, function (err) {
+  retryTransactionWrapper(rateVideo, options, function (err) {
     if (err) return next(err)
 
     return res.type('json').status(204).end()
@@ -46,7 +58,7 @@ function rateVideo (req, res, finalCallback) {
   const userInstance = res.locals.oauth.token.User
 
   waterfall([
-    databaseUtils.startSerializableTransaction,
+    startSerializableTransaction,
 
     function findPreviousRate (t, callback) {
       db.UserVideoRate.load(userInstance.id, videoInstance.id, t, function (err, previousRate) {
@@ -60,14 +72,14 @@ function rateVideo (req, res, finalCallback) {
       let likesToIncrement = 0
       let dislikesToIncrement = 0
 
-      if (rateType === constants.VIDEO_RATE_TYPES.LIKE) likesToIncrement++
-      else if (rateType === constants.VIDEO_RATE_TYPES.DISLIKE) dislikesToIncrement++
+      if (rateType === VIDEO_RATE_TYPES.LIKE) likesToIncrement++
+      else if (rateType === VIDEO_RATE_TYPES.DISLIKE) dislikesToIncrement++
 
       // There was a previous rate, update it
       if (previousRate) {
         // We will remove the previous rate, so we will need to remove it from the video attribute
-        if (previousRate.type === constants.VIDEO_RATE_TYPES.LIKE) likesToIncrement--
-        else if (previousRate.type === constants.VIDEO_RATE_TYPES.DISLIKE) dislikesToIncrement--
+        if (previousRate.type === VIDEO_RATE_TYPES.LIKE) likesToIncrement--
+        else if (previousRate.type === VIDEO_RATE_TYPES.DISLIKE) dislikesToIncrement--
 
         previousRate.type = rateType
 
@@ -110,7 +122,7 @@ function rateVideo (req, res, finalCallback) {
       if (likesToIncrement !== 0) {
         eventsParams.push({
           videoId: videoInstance.id,
-          type: constants.REQUEST_VIDEO_EVENT_TYPES.LIKES,
+          type: REQUEST_VIDEO_EVENT_TYPES.LIKES,
           count: likesToIncrement
         })
       }
@@ -118,12 +130,12 @@ function rateVideo (req, res, finalCallback) {
       if (dislikesToIncrement !== 0) {
         eventsParams.push({
           videoId: videoInstance.id,
-          type: constants.REQUEST_VIDEO_EVENT_TYPES.DISLIKES,
+          type: REQUEST_VIDEO_EVENT_TYPES.DISLIKES,
           count: dislikesToIncrement
         })
       }
 
-      friends.addEventsToRemoteVideo(eventsParams, t, function (err) {
+      addEventsToRemoteVideo(eventsParams, t, function (err) {
         return callback(err, t, likesToIncrement, dislikesToIncrement)
       })
     },
@@ -138,29 +150,29 @@ function rateVideo (req, res, finalCallback) {
       if (likesToIncrement !== 0) {
         qadusParams.push({
           videoId: videoInstance.id,
-          type: constants.REQUEST_VIDEO_QADU_TYPES.LIKES
+          type: REQUEST_VIDEO_QADU_TYPES.LIKES
         })
       }
 
       if (dislikesToIncrement !== 0) {
         qadusParams.push({
           videoId: videoInstance.id,
-          type: constants.REQUEST_VIDEO_QADU_TYPES.DISLIKES
+          type: REQUEST_VIDEO_QADU_TYPES.DISLIKES
         })
       }
 
-      friends.quickAndDirtyUpdatesVideoToFriends(qadusParams, t, function (err) {
+      quickAndDirtyUpdatesVideoToFriends(qadusParams, t, function (err) {
         return callback(err, t)
       })
     },
 
-    databaseUtils.commitTransaction
+    commitTransaction
 
   ], function (err, t) {
     if (err) {
       // This is just a debug because we will retry the insert
       logger.debug('Cannot add the user video rate.', { error: err })
-      return databaseUtils.rollbackTransaction(err, t, finalCallback)
+      return rollbackTransaction(err, t, finalCallback)
     }
 
     logger.info('User video rate for video %s of user %s updated.', videoInstance.name, userInstance.username)