18 files changed, 155 insertions, 178 deletions

diff --git a/server/models/application.js b/server/models/application.ts
index 64e1a0540..38a57e327 100644
--- a/server/models/application.js
+++ b/server/models/application.ts
@@ -1,5 +1,3 @@
-'use strict'
-
 module.exports = function (sequelize, DataTypes) {
   const Application = sequelize.define('Application',
     {
@@ -38,7 +36,7 @@ function loadMigrationVersion (callback) {
 }
 
 function updateMigrationVersion (newVersion, transaction, callback) {
-  const options = {
+  const options: { where?: any, transaction?: any } = {
     where: {}
   }
 
diff --git a/server/models/author.js b/server/models/author.ts
index 34b013097..4a7396929 100644
--- a/server/models/author.js
+++ b/server/models/author.ts
@@ -1,6 +1,4 @@
-'use strict'
-
-const customUsersValidators = require('../helpers/custom-validators').users
+import { isUserUsernameValid } from '../helpers'
 
 module.exports = function (sequelize, DataTypes) {
   const Author = sequelize.define('Author',
@@ -10,7 +8,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           usernameValid: function (value) {
-            const res = customUsersValidators.isUserUsernameValid(value)
+            const res = isUserUsernameValid(value)
             if (res === false) throw new Error('Username is not valid.')
           }
         }
@@ -76,7 +74,7 @@ function findOrCreateAuthor (name, podId, userId, transaction, callback) {
     userId
   }
 
-  const query = {
+  const query: any = {
     where: author,
     defaults: author
   }
diff --git a/server/models/job.js b/server/models/job.ts
index 949f88d44..6843e399b 100644
--- a/server/models/job.js
+++ b/server/models/job.ts
@@ -1,8 +1,6 @@
-'use strict'
+import { values } from 'lodash'
 
-const values = require('lodash/values')
-
-const constants = require('../initializers/constants')
+import { JOB_STATES } from '../initializers'
 
 // ---------------------------------------------------------------------------
 
@@ -10,7 +8,7 @@ module.exports = function (sequelize, DataTypes) {
   const Job = sequelize.define('Job',
     {
       state: {
-        type: DataTypes.ENUM(values(constants.JOB_STATES)),
+        type: DataTypes.ENUM(values(JOB_STATES)),
         allowNull: false
       },
       handlerName: {
diff --git a/server/models/oauth-client.js b/server/models/oauth-client.ts
index 021a34007..3198a85ef 100644
--- a/server/models/oauth-client.js
+++ b/server/models/oauth-client.ts
@@ -1,5 +1,3 @@
-'use strict'
-
 module.exports = function (sequelize, DataTypes) {
   const OAuthClient = sequelize.define('OAuthClient',
     {
diff --git a/server/models/oauth-token.js b/server/models/oauth-token.ts
index 68e7c9ff7..74c9180eb 100644
--- a/server/models/oauth-token.js
+++ b/server/models/oauth-token.ts
@@ -1,6 +1,4 @@
-'use strict'
-
-const logger = require('../helpers/logger')
+import { logger } from '../helpers'
 
 // ---------------------------------------------------------------------------
 
diff --git a/server/models/pod.js b/server/models/pod.ts
index 8e2d488e1..0e0262978 100644
--- a/server/models/pod.js
+++ b/server/models/pod.ts
@@ -1,12 +1,8 @@
-'use strict'
+import { each, waterfall } from 'async'
+import { map } from 'lodash'
 
-const each = require('async/each')
-const map = require('lodash/map')
-const waterfall = require('async/waterfall')
-
-const constants = require('../initializers/constants')
-const logger = require('../helpers/logger')
-const customPodsValidators = require('../helpers/custom-validators').pods
+import { FRIEND_SCORE, PODS_SCORE } from '../initializers'
+import { logger, isHostValid } from '../helpers'
 
 // ---------------------------------------------------------------------------
 
@@ -18,7 +14,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           isHost: function (value) {
-            const res = customPodsValidators.isHostValid(value)
+            const res = isHostValid(value)
             if (res === false) throw new Error('Host not valid.')
           }
         }
@@ -29,11 +25,11 @@ module.exports = function (sequelize, DataTypes) {
       },
       score: {
         type: DataTypes.INTEGER,
-        defaultValue: constants.FRIEND_SCORE.BASE,
+        defaultValue: FRIEND_SCORE.BASE,
         allowNull: false,
         validate: {
           isInt: true,
-          max: constants.FRIEND_SCORE.MAX
+          max: FRIEND_SCORE.MAX
         }
       },
       email: {
@@ -106,7 +102,7 @@ function countAll (callback) {
 }
 
 function incrementScores (ids, value, callback) {
-  if (!callback) callback = function () {}
+  if (!callback) callback = function () { /* empty */ }
 
   const update = {
     score: this.sequelize.literal('score +' + value)
@@ -135,7 +131,7 @@ function listAllIds (transaction, callback) {
     transaction = null
   }
 
-  const query = {
+  const query: any = {
     attributes: [ 'id' ]
   }
 
@@ -223,13 +219,13 @@ function updatePodsScore (goodPods, badPods) {
   logger.info('Updating %d good pods and %d bad pods scores.', goodPods.length, badPods.length)
 
   if (goodPods.length !== 0) {
-    this.incrementScores(goodPods, constants.PODS_SCORE.BONUS, function (err) {
+    this.incrementScores(goodPods, PODS_SCORE.BONUS, function (err) {
       if (err) logger.error('Cannot increment scores of good pods.', { error: err })
     })
   }
 
   if (badPods.length !== 0) {
-    this.incrementScores(badPods, constants.PODS_SCORE.MALUS, function (err) {
+    this.incrementScores(badPods, PODS_SCORE.MALUS, function (err) {
       if (err) logger.error('Cannot decrement scores of bad pods.', { error: err })
       removeBadPods.call(self)
     })
@@ -255,7 +251,7 @@ function removeBadPods () {
     },
 
     function removeTheseBadPods (pods, callback) {
-      each(pods, function (pod, callbackEach) {
+      each(pods, function (pod: any, callbackEach) {
         pod.destroy().asCallback(callbackEach)
       }, function (err) {
         return callback(err, pods.length)
diff --git a/server/models/request-to-pod.js b/server/models/request-to-pod.ts
index 0e01a842e..479202e40 100644
--- a/server/models/request-to-pod.js
+++ b/server/models/request-to-pod.ts
@@ -1,7 +1,3 @@
-'use strict'
-
-// ---------------------------------------------------------------------------
-
 module.exports = function (sequelize, DataTypes) {
   const RequestToPod = sequelize.define('RequestToPod', {}, {
     indexes: [
@@ -27,7 +23,7 @@ module.exports = function (sequelize, DataTypes) {
 // ---------------------------------------------------------------------------
 
 function removeByRequestIdsAndPod (requestsIds, podId, callback) {
-  if (!callback) callback = function () {}
+  if (!callback) callback = function () { /* empty */ }
 
   const query = {
     where: {
diff --git a/server/models/request-video-event.js b/server/models/request-video-event.ts
index 9ebeaec90..c61525029 100644
--- a/server/models/request-video-event.js
+++ b/server/models/request-video-event.ts
@@ -1,13 +1,11 @@
-'use strict'
-
 /*
   Request Video events (likes, dislikes, views...)
 */
 
-const values = require('lodash/values')
+import { values } from 'lodash'
 
-const constants = require('../initializers/constants')
-const customVideosValidators = require('../helpers/custom-validators').videos
+import { REQUEST_VIDEO_EVENT_TYPES } from '../initializers'
+import { isVideoEventCountValid } from '../helpers'
 
 // ---------------------------------------------------------------------------
 
@@ -15,7 +13,7 @@ module.exports = function (sequelize, DataTypes) {
   const RequestVideoEvent = sequelize.define('RequestVideoEvent',
     {
       type: {
-        type: DataTypes.ENUM(values(constants.REQUEST_VIDEO_EVENT_TYPES)),
+        type: DataTypes.ENUM(values(REQUEST_VIDEO_EVENT_TYPES)),
         allowNull: false
       },
       count: {
@@ -23,7 +21,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           countValid: function (value) {
-            const res = customVideosValidators.isVideoEventCountValid(value)
+            const res = isVideoEventCountValid(value)
             if (res === false) throw new Error('Video event count is not valid.')
           }
         }
diff --git a/server/models/request-video-qadu.js b/server/models/request-video-qadu.ts
index 5d88738aa..2b1ed07c9 100644
--- a/server/models/request-video-qadu.js
+++ b/server/models/request-video-qadu.ts
@@ -1,5 +1,3 @@
-'use strict'
-
 /*
   Request Video for Quick And Dirty Updates like:
    - views
@@ -11,9 +9,9 @@
   So we put it an independant request scheduler.
 */
 
-const values = require('lodash/values')
+import { values } from 'lodash'
 
-const constants = require('../initializers/constants')
+import { REQUEST_VIDEO_QADU_TYPES } from '../initializers'
 
 // ---------------------------------------------------------------------------
 
@@ -21,7 +19,7 @@ module.exports = function (sequelize, DataTypes) {
   const RequestVideoQadu = sequelize.define('RequestVideoQadu',
     {
       type: {
-        type: DataTypes.ENUM(values(constants.REQUEST_VIDEO_QADU_TYPES)),
+        type: DataTypes.ENUM(values(REQUEST_VIDEO_QADU_TYPES)),
         allowNull: false
       }
     },
diff --git a/server/models/request.js b/server/models/request.ts
index 3a047f7ee..672f79d11 100644
--- a/server/models/request.js
+++ b/server/models/request.ts
@@ -1,8 +1,6 @@
-'use strict'
+import { values } from 'lodash'
 
-const values = require('lodash/values')
-
-const constants = require('../initializers/constants')
+import { REQUEST_ENDPOINTS } from '../initializers'
 
 // ---------------------------------------------------------------------------
 
@@ -14,7 +12,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false
       },
       endpoint: {
-        type: DataTypes.ENUM(values(constants.REQUEST_ENDPOINTS)),
+        type: DataTypes.ENUM(values(REQUEST_ENDPOINTS)),
         allowNull: false
       }
     },
@@ -100,7 +98,7 @@ function removeAll (callback) {
 }
 
 function removeWithEmptyTo (callback) {
-  if (!callback) callback = function () {}
+  if (!callback) callback = function () { /* empty */ }
 
   const query = {
     where: {
diff --git a/server/models/tag.js b/server/models/tag.ts
index 145e090c1..85a0442d2 100644
--- a/server/models/tag.js
+++ b/server/models/tag.ts
@@ -1,6 +1,4 @@
-'use strict'
-
-const each = require('async/each')
+import { each } from 'async'
 
 // ---------------------------------------------------------------------------
 
@@ -51,7 +49,7 @@ function findOrCreateTags (tags, transaction, callback) {
   const tagInstances = []
 
   each(tags, function (tag, callbackEach) {
-    const query = {
+    const query: any = {
       where: {
         name: tag
       },
diff --git a/server/models/user-video-rate.js b/server/models/user-video-rate.ts
index 84007d70c..6603c7862 100644
--- a/server/models/user-video-rate.js
+++ b/server/models/user-video-rate.ts
@@ -1,13 +1,10 @@
-'use strict'
-
 /*
   User rates per video.
 
 */
+import { values } from 'lodash'
 
-const values = require('lodash/values')
-
-const constants = require('../initializers/constants')
+import { VIDEO_RATE_TYPES } from '../initializers'
 
 // ---------------------------------------------------------------------------
 
@@ -15,7 +12,7 @@ module.exports = function (sequelize, DataTypes) {
   const UserVideoRate = sequelize.define('UserVideoRate',
     {
       type: {
-        type: DataTypes.ENUM(values(constants.VIDEO_RATE_TYPES)),
+        type: DataTypes.ENUM(values(VIDEO_RATE_TYPES)),
         allowNull: false
       }
     },
@@ -70,7 +67,7 @@ function load (userId, videoId, transaction, callback) {
     }
   }
 
-  const options = {}
+  const options: any = {}
   if (transaction) options.transaction = transaction
 
   return this.findOne(query, options).asCallback(callback)
diff --git a/server/models/user.js b/server/models/user.ts
index 8f9c2bf65..d63a50cc4 100644
--- a/server/models/user.js
+++ b/server/models/user.ts
@@ -1,11 +1,14 @@
-'use strict'
-
-const values = require('lodash/values')
-
-const modelUtils = require('./utils')
-const constants = require('../initializers/constants')
-const peertubeCrypto = require('../helpers/peertube-crypto')
-const customUsersValidators = require('../helpers/custom-validators').users
+import { values } from 'lodash'
+
+import { getSort } from './utils'
+import { USER_ROLES } from '../initializers'
+import {
+  cryptPassword,
+  comparePassword,
+  isUserPasswordValid,
+  isUserUsernameValid,
+  isUserDisplayNSFWValid
+} from '../helpers'
 
 // ---------------------------------------------------------------------------
 
@@ -17,7 +20,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           passwordValid: function (value) {
-            const res = customUsersValidators.isUserPasswordValid(value)
+            const res = isUserPasswordValid(value)
             if (res === false) throw new Error('Password not valid.')
           }
         }
@@ -27,7 +30,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           usernameValid: function (value) {
-            const res = customUsersValidators.isUserUsernameValid(value)
+            const res = isUserUsernameValid(value)
             if (res === false) throw new Error('Username not valid.')
           }
         }
@@ -45,13 +48,13 @@ module.exports = function (sequelize, DataTypes) {
         defaultValue: false,
         validate: {
           nsfwValid: function (value) {
-            const res = customUsersValidators.isUserDisplayNSFWValid(value)
+            const res = isUserDisplayNSFWValid(value)
             if (res === false) throw new Error('Display NSFW is not valid.')
           }
         }
       },
       role: {
-        type: DataTypes.ENUM(values(constants.USER_ROLES)),
+        type: DataTypes.ENUM(values(USER_ROLES)),
         allowNull: false
       }
     },
@@ -93,7 +96,7 @@ module.exports = function (sequelize, DataTypes) {
 }
 
 function beforeCreateOrUpdate (user, options, next) {
-  peertubeCrypto.cryptPassword(user.password, function (err, hash) {
+  cryptPassword(user.password, function (err, hash) {
     if (err) return next(err)
 
     user.password = hash
@@ -105,7 +108,7 @@ function beforeCreateOrUpdate (user, options, next) {
 // ------------------------------ METHODS ------------------------------
 
 function isPasswordMatch (password, callback) {
-  return peertubeCrypto.comparePassword(password, this.password, callback)
+  return comparePassword(password, this.password, callback)
 }
 
 function toFormatedJSON () {
@@ -120,7 +123,7 @@ function toFormatedJSON () {
 }
 
 function isAdmin () {
-  return this.role === constants.USER_ROLES.ADMIN
+  return this.role === USER_ROLES.ADMIN
 }
 
 // ------------------------------ STATICS ------------------------------
@@ -159,7 +162,7 @@ function listForApi (start, count, sort, callback) {
   const query = {
     offset: start,
     limit: count,
-    order: [ modelUtils.getSort(sort) ]
+    order: [ getSort(sort) ]
   }
 
   return this.findAndCountAll(query).asCallback(function (err, result) {
diff --git a/server/models/utils.js b/server/models/utils.ts
index 49636b3d8..601811913 100644
--- a/server/models/utils.js
+++ b/server/models/utils.ts
@@ -1,9 +1,3 @@
-'use strict'
-
-const utils = {
-  getSort
-}
-
 // Translate for example "-name" to [ 'name', 'DESC' ]
 function getSort (value) {
   let field
@@ -22,4 +16,6 @@ function getSort (value) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = utils
+export {
+  getSort
+}
diff --git a/server/models/video-abuse.js b/server/models/video-abuse.ts
index 67cead3af..2a18a293d 100644
--- a/server/models/video-abuse.js
+++ b/server/models/video-abuse.ts
@@ -1,8 +1,6 @@
-'use strict'
-
-const constants = require('../initializers/constants')
-const modelUtils = require('./utils')
-const customVideosValidators = require('../helpers/custom-validators').videos
+import { CONFIG } from '../initializers'
+import { isVideoAbuseReporterUsernameValid, isVideoAbuseReasonValid } from '../helpers'
+import { getSort } from './utils'
 
 module.exports = function (sequelize, DataTypes) {
   const VideoAbuse = sequelize.define('VideoAbuse',
@@ -12,7 +10,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           reporterUsernameValid: function (value) {
-            const res = customVideosValidators.isVideoAbuseReporterUsernameValid(value)
+            const res = isVideoAbuseReporterUsernameValid(value)
             if (res === false) throw new Error('Video abuse reporter username is not valid.')
           }
         }
@@ -22,7 +20,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           reasonValid: function (value) {
-            const res = customVideosValidators.isVideoAbuseReasonValid(value)
+            const res = isVideoAbuseReasonValid(value)
             if (res === false) throw new Error('Video abuse reason is not valid.')
           }
         }
@@ -75,7 +73,7 @@ function listForApi (start, count, sort, callback) {
   const query = {
     offset: start,
     limit: count,
-    order: [ modelUtils.getSort(sort) ],
+    order: [ getSort(sort) ],
     include: [
       {
         model: this.sequelize.models.Pod,
@@ -98,7 +96,7 @@ function toFormatedJSON () {
     reporterPodHost = this.Pod.host
   } else {
     // It means it's our video
-    reporterPodHost = constants.CONFIG.WEBSERVER.HOST
+    reporterPodHost = CONFIG.WEBSERVER.HOST
   }
 
   const json = {
diff --git a/server/models/video-blacklist.js b/server/models/video-blacklist.ts
index 02ea15760..1f00702c7 100644
--- a/server/models/video-blacklist.js
+++ b/server/models/video-blacklist.ts
@@ -1,6 +1,4 @@
-'use strict'
-
-const modelUtils = require('./utils')
+import { getSort } from './utils'
 
 // ---------------------------------------------------------------------------
 
@@ -64,7 +62,7 @@ function listForApi (start, count, sort, callback) {
   const query = {
     offset: start,
     limit: count,
-    order: [ modelUtils.getSort(sort) ]
+    order: [ getSort(sort) ]
   }
 
   return this.findAndCountAll(query).asCallback(function (err, result) {
diff --git a/server/models/video-tag.js b/server/models/video-tag.ts
index cd9277a6e..83ff6053f 100644
--- a/server/models/video-tag.js
+++ b/server/models/video-tag.ts
@@ -1,7 +1,3 @@
-'use strict'
-
-// ---------------------------------------------------------------------------
-
 module.exports = function (sequelize, DataTypes) {
   const VideoTag = sequelize.define('VideoTag', {}, {
     indexes: [
diff --git a/server/models/video.js b/server/models/video.ts
index da4ddb420..1e29f1355 100644
--- a/server/models/video.js
+++ b/server/models/video.ts
@@ -1,24 +1,38 @@
-'use strict'
-
-const Buffer = require('safe-buffer').Buffer
-const createTorrent = require('create-torrent')
-const ffmpeg = require('fluent-ffmpeg')
-const fs = require('fs')
-const magnetUtil = require('magnet-uri')
-const map = require('lodash/map')
-const parallel = require('async/parallel')
-const series = require('async/series')
-const parseTorrent = require('parse-torrent')
-const pathUtils = require('path')
-const values = require('lodash/values')
-
-const constants = require('../initializers/constants')
-const logger = require('../helpers/logger')
-const friends = require('../lib/friends')
-const modelUtils = require('./utils')
-const customVideosValidators = require('../helpers/custom-validators').videos
+import safeBuffer = require('safe-buffer')
+const Buffer = safeBuffer.Buffer
+import createTorrent = require('create-torrent')
+import ffmpeg = require('fluent-ffmpeg')
+import fs = require('fs')
+import magnetUtil = require('magnet-uri')
+import { map, values } from 'lodash'
+import { parallel, series } from 'async'
+import parseTorrent = require('parse-torrent')
+import { join } from 'path'
+
 const db = require('../initializers/database')
-const jobScheduler = require('../lib/jobs/job-scheduler')
+import {
+  logger,
+  isVideoNameValid,
+  isVideoCategoryValid,
+  isVideoLicenceValid,
+  isVideoLanguageValid,
+  isVideoNSFWValid,
+  isVideoDescriptionValid,
+  isVideoInfoHashValid,
+  isVideoDurationValid
+} from '../helpers'
+import {
+  CONSTRAINTS_FIELDS,
+  CONFIG,
+  REMOTE_SCHEME,
+  STATIC_PATHS,
+  VIDEO_CATEGORIES,
+  VIDEO_LICENCES,
+  VIDEO_LANGUAGES,
+  THUMBNAILS_SIZE
+} from '../initializers'
+import { JobScheduler, removeVideoToFriends } from '../lib'
+import { getSort } from './utils'
 
 // ---------------------------------------------------------------------------
 
@@ -38,13 +52,13 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           nameValid: function (value) {
-            const res = customVideosValidators.isVideoNameValid(value)
+            const res = isVideoNameValid(value)
             if (res === false) throw new Error('Video name is not valid.')
           }
         }
       },
       extname: {
-        type: DataTypes.ENUM(values(constants.CONSTRAINTS_FIELDS.VIDEOS.EXTNAME)),
+        type: DataTypes.ENUM(values(CONSTRAINTS_FIELDS.VIDEOS.EXTNAME)),
         allowNull: false
       },
       remoteId: {
@@ -59,7 +73,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           categoryValid: function (value) {
-            const res = customVideosValidators.isVideoCategoryValid(value)
+            const res = isVideoCategoryValid(value)
             if (res === false) throw new Error('Video category is not valid.')
           }
         }
@@ -70,7 +84,7 @@ module.exports = function (sequelize, DataTypes) {
         defaultValue: null,
         validate: {
           licenceValid: function (value) {
-            const res = customVideosValidators.isVideoLicenceValid(value)
+            const res = isVideoLicenceValid(value)
             if (res === false) throw new Error('Video licence is not valid.')
           }
         }
@@ -80,7 +94,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: true,
         validate: {
           languageValid: function (value) {
-            const res = customVideosValidators.isVideoLanguageValid(value)
+            const res = isVideoLanguageValid(value)
             if (res === false) throw new Error('Video language is not valid.')
           }
         }
@@ -90,7 +104,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           nsfwValid: function (value) {
-            const res = customVideosValidators.isVideoNSFWValid(value)
+            const res = isVideoNSFWValid(value)
             if (res === false) throw new Error('Video nsfw attribute is not valid.')
           }
         }
@@ -100,7 +114,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           descriptionValid: function (value) {
-            const res = customVideosValidators.isVideoDescriptionValid(value)
+            const res = isVideoDescriptionValid(value)
             if (res === false) throw new Error('Video description is not valid.')
           }
         }
@@ -110,7 +124,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           infoHashValid: function (value) {
-            const res = customVideosValidators.isVideoInfoHashValid(value)
+            const res = isVideoInfoHashValid(value)
             if (res === false) throw new Error('Video info hash is not valid.')
           }
         }
@@ -120,7 +134,7 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         validate: {
           durationValid: function (value) {
-            const res = customVideosValidators.isVideoDurationValid(value)
+            const res = isVideoDurationValid(value)
             if (res === false) throw new Error('Video duration is not valid.')
           }
         }
@@ -233,7 +247,7 @@ function beforeCreate (video, options, next) {
   const tasks = []
 
   if (video.isOwned()) {
-    const videoPath = pathUtils.join(constants.CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename())
+    const videoPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename())
 
     tasks.push(
       function createVideoTorrent (callback) {
@@ -249,14 +263,14 @@ function beforeCreate (video, options, next) {
       }
     )
 
-    if (constants.CONFIG.TRANSCODING.ENABLED === true) {
+    if (CONFIG.TRANSCODING.ENABLED === true) {
       tasks.push(
         function createVideoTranscoderJob (callback) {
           const dataInput = {
             id: video.id
           }
 
-          jobScheduler.createJob(options.transaction, 'videoTranscoder', dataInput, callback)
+          JobScheduler.Instance.createJob(options.transaction, 'videoTranscoder', dataInput, callback)
         }
       )
     }
@@ -295,7 +309,7 @@ function afterDestroy (video, options, next) {
           remoteId: video.id
         }
 
-        friends.removeVideoToFriends(params)
+        removeVideoToFriends(params)
 
         return callback()
       }
@@ -332,19 +346,20 @@ function associate (models) {
 }
 
 function generateMagnetUri () {
-  let baseUrlHttp, baseUrlWs
+  let baseUrlHttp
+  let baseUrlWs
 
   if (this.isOwned()) {
-    baseUrlHttp = constants.CONFIG.WEBSERVER.URL
-    baseUrlWs = constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOSTNAME + ':' + constants.CONFIG.WEBSERVER.PORT
+    baseUrlHttp = CONFIG.WEBSERVER.URL
+    baseUrlWs = CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
   } else {
-    baseUrlHttp = constants.REMOTE_SCHEME.HTTP + '://' + this.Author.Pod.host
-    baseUrlWs = constants.REMOTE_SCHEME.WS + '://' + this.Author.Pod.host
+    baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + this.Author.Pod.host
+    baseUrlWs = REMOTE_SCHEME.WS + '://' + this.Author.Pod.host
   }
 
-  const xs = baseUrlHttp + constants.STATIC_PATHS.TORRENTS + this.getTorrentName()
+  const xs = baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentName()
   const announce = baseUrlWs + '/tracker/socket'
-  const urlList = [ baseUrlHttp + constants.STATIC_PATHS.WEBSEED + this.getVideoFilename() ]
+  const urlList = [ baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename() ]
 
   const magnetHash = {
     xs,
@@ -395,19 +410,19 @@ function toFormatedJSON () {
     podHost = this.Author.Pod.host
   } else {
     // It means it's our video
-    podHost = constants.CONFIG.WEBSERVER.HOST
+    podHost = CONFIG.WEBSERVER.HOST
   }
 
   // Maybe our pod is not up to date and there are new categories since our version
-  let categoryLabel = constants.VIDEO_CATEGORIES[this.category]
+  let categoryLabel = VIDEO_CATEGORIES[this.category]
   if (!categoryLabel) categoryLabel = 'Misc'
 
   // Maybe our pod is not up to date and there are new licences since our version
-  let licenceLabel = constants.VIDEO_LICENCES[this.licence]
+  let licenceLabel = VIDEO_LICENCES[this.licence]
   if (!licenceLabel) licenceLabel = 'Unknown'
 
   // Language is an optional attribute
-  let languageLabel = constants.VIDEO_LANGUAGES[this.language]
+  let languageLabel = VIDEO_LANGUAGES[this.language]
   if (!languageLabel) languageLabel = 'Unknown'
 
   const json = {
@@ -430,7 +445,7 @@ function toFormatedJSON () {
     likes: this.likes,
     dislikes: this.dislikes,
     tags: map(this.Tags, 'name'),
-    thumbnailPath: pathUtils.join(constants.STATIC_PATHS.THUMBNAILS, this.getThumbnailName()),
+    thumbnailPath: join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName()),
     createdAt: this.createdAt,
     updatedAt: this.updatedAt
   }
@@ -442,7 +457,7 @@ function toAddRemoteJSON (callback) {
   const self = this
 
   // Get thumbnail data to send to the other pod
-  const thumbnailPath = pathUtils.join(constants.CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
+  const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
   fs.readFile(thumbnailPath, function (err, thumbnailData) {
     if (err) {
       logger.error('Cannot read the thumbnail of the video')
@@ -501,15 +516,15 @@ function toUpdateRemoteJSON (callback) {
 function transcodeVideofile (finalCallback) {
   const video = this
 
-  const videosDirectory = constants.CONFIG.STORAGE.VIDEOS_DIR
+  const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
   const newExtname = '.mp4'
-  const videoInputPath = pathUtils.join(videosDirectory, video.getVideoFilename())
-  const videoOutputPath = pathUtils.join(videosDirectory, video.id + '-transcoded' + newExtname)
+  const videoInputPath = join(videosDirectory, video.getVideoFilename())
+  const videoOutputPath = join(videosDirectory, video.id + '-transcoded' + newExtname)
 
   ffmpeg(videoInputPath)
     .output(videoOutputPath)
     .videoCodec('libx264')
-    .outputOption('-threads ' + constants.CONFIG.TRANSCODING.THREADS)
+    .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS)
     .outputOption('-movflags faststart')
     .on('error', finalCallback)
     .on('end', function () {
@@ -522,12 +537,12 @@ function transcodeVideofile (finalCallback) {
           // Important to do this before getVideoFilename() to take in account the new file extension
           video.set('extname', newExtname)
 
-          const newVideoPath = pathUtils.join(videosDirectory, video.getVideoFilename())
+          const newVideoPath = join(videosDirectory, video.getVideoFilename())
           fs.rename(videoOutputPath, newVideoPath, callback)
         },
 
         function torrent (callback) {
-          const newVideoPath = pathUtils.join(videosDirectory, video.getVideoFilename())
+          const newVideoPath = join(videosDirectory, video.getVideoFilename())
           createTorrentFromVideo(video, newVideoPath, callback)
         },
 
@@ -557,7 +572,7 @@ function generateThumbnailFromData (video, thumbnailData, callback) {
   // Creating the thumbnail for a remote video
 
   const thumbnailName = video.getThumbnailName()
-  const thumbnailPath = pathUtils.join(constants.CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName)
+  const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName)
   fs.writeFile(thumbnailPath, Buffer.from(thumbnailData, 'binary'), function (err) {
     if (err) return callback(err)
 
@@ -583,7 +598,7 @@ function listForApi (start, count, sort, callback) {
     offset: start,
     limit: count,
     distinct: true, // For the count, a video can have many tags
-    order: [ modelUtils.getSort(sort), [ this.sequelize.models.Tag, 'name', 'ASC' ] ],
+    order: [ getSort(sort), [ this.sequelize.models.Tag, 'name', 'ASC' ] ],
     include: [
       {
         model: this.sequelize.models.Author,
@@ -683,28 +698,28 @@ function loadAndPopulateAuthorAndPodAndTags (id, callback) {
 }
 
 function searchAndPopulateAuthorAndPodAndTags (value, field, start, count, sort, callback) {
-  const podInclude = {
+  const podInclude: any = {
     model: this.sequelize.models.Pod,
     required: false
   }
 
-  const authorInclude = {
+  const authorInclude: any = {
     model: this.sequelize.models.Author,
     include: [
       podInclude
     ]
   }
 
-  const tagInclude = {
+  const tagInclude: any = {
     model: this.sequelize.models.Tag
   }
 
-  const query = {
+  const query: any = {
     where: createBaseVideosWhere.call(this),
     offset: start,
     limit: count,
     distinct: true, // For the count, a video can have many tags
-    order: [ modelUtils.getSort(sort), [ this.sequelize.models.Tag, 'name', 'ASC' ] ]
+    order: [ getSort(sort), [ this.sequelize.models.Tag, 'name', 'ASC' ] ]
   }
 
   // Make an exact search with the magnet
@@ -766,39 +781,39 @@ function createBaseVideosWhere () {
 }
 
 function removeThumbnail (video, callback) {
-  const thumbnailPath = pathUtils.join(constants.CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName())
+  const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName())
   fs.unlink(thumbnailPath, callback)
 }
 
 function removeFile (video, callback) {
-  const filePath = pathUtils.join(constants.CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename())
+  const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename())
   fs.unlink(filePath, callback)
 }
 
 function removeTorrent (video, callback) {
-  const torrenPath = pathUtils.join(constants.CONFIG.STORAGE.TORRENTS_DIR, video.getTorrentName())
+  const torrenPath = join(CONFIG.STORAGE.TORRENTS_DIR, video.getTorrentName())
   fs.unlink(torrenPath, callback)
 }
 
 function removePreview (video, callback) {
   // Same name than video thumnail
-  fs.unlink(constants.CONFIG.STORAGE.PREVIEWS_DIR + video.getPreviewName(), callback)
+  fs.unlink(CONFIG.STORAGE.PREVIEWS_DIR + video.getPreviewName(), callback)
 }
 
 function createTorrentFromVideo (video, videoPath, callback) {
   const options = {
     announceList: [
-      [ constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOSTNAME + ':' + constants.CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
+      [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
     ],
     urlList: [
-      constants.CONFIG.WEBSERVER.URL + constants.STATIC_PATHS.WEBSEED + video.getVideoFilename()
+      CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + video.getVideoFilename()
     ]
   }
 
   createTorrent(videoPath, options, function (err, torrent) {
     if (err) return callback(err)
 
-    const filePath = pathUtils.join(constants.CONFIG.STORAGE.TORRENTS_DIR, video.getTorrentName())
+    const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, video.getTorrentName())
     fs.writeFile(filePath, torrent, function (err) {
       if (err) return callback(err)
 
@@ -810,15 +825,15 @@ function createTorrentFromVideo (video, videoPath, callback) {
 }
 
 function createPreview (video, videoPath, callback) {
-  generateImage(video, videoPath, constants.CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName(), callback)
+  generateImage(video, videoPath, CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName(), callback)
 }
 
 function createThumbnail (video, videoPath, callback) {
-  generateImage(video, videoPath, constants.CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName(), constants.THUMBNAILS_SIZE, callback)
+  generateImage(video, videoPath, CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName(), THUMBNAILS_SIZE, callback)
 }
 
-function generateImage (video, videoPath, folder, imageName, size, callback) {
-  const options = {
+function generateImage (video, videoPath, folder, imageName, size, callback?) {
+  const options: any = {
     filename: imageName,
     count: 1,
     folder