From 075f16caac5236cb04c98ae7b3a989766d764bb3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 11 Jul 2017 17:04:57 +0200 Subject: Remove "function" in favor of () => {} --- server/middlewares/validators/pods.ts | 4 ++-- server/middlewares/validators/users.ts | 6 +++--- server/middlewares/validators/videos.ts | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/pods.ts b/server/middlewares/validators/pods.ts index 022fd7f9a..481a66957 100644 --- a/server/middlewares/validators/pods.ts +++ b/server/middlewares/validators/pods.ts @@ -18,7 +18,7 @@ function makeFriendsValidator (req: express.Request, res: express.Response, next logger.debug('Checking makeFriends parameters', { parameters: req.body }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { hasFriends() .then(heHasFriends => { if (heHasFriends === true) { @@ -41,7 +41,7 @@ function podsAddValidator (req: express.Request, res: express.Response, next: ex req.checkBody('publicKey', 'Should have a public key').notEmpty() logger.debug('Checking podsAdd parameters', { parameters: req.body }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { db.Pod.loadByHost(req.body.host) .then(pod => { // Pod with this host already exists diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index 90a46752c..38f8aed5b 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts @@ -15,7 +15,7 @@ function usersAddValidator (req: express.Request, res: express.Response, next: e logger.debug('Checking usersAdd parameters', { parameters: req.body }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { db.User.loadByUsernameOrEmail(req.body.username, req.body.email) .then(user => { if (user) return res.status(409).send('User already exists.') @@ -34,7 +34,7 @@ function usersRemoveValidator (req: express.Request, res: express.Response, next logger.debug('Checking usersRemove parameters', { parameters: req.params }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { db.User.loadById(req.params.id) .then(user => { if (!user) return res.status(404).send('User not found') @@ -66,7 +66,7 @@ function usersVideoRatingValidator (req: express.Request, res: express.Response, logger.debug('Checking usersVideoRating parameters', { parameters: req.params }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { let videoPromise: Promise if (validator.isUUID(req.params.videoId)) { diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts index 0a88e064e..bd223a1cb 100644 --- a/server/middlewares/validators/videos.ts +++ b/server/middlewares/validators/videos.ts @@ -23,7 +23,7 @@ function videosAddValidator (req: express.Request, res: express.Response, next: logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { const videoFile = req.files.videofile[0] db.Video.getDurationFromFile(videoFile.path) @@ -54,8 +54,8 @@ function videosUpdateValidator (req: express.Request, res: express.Response, nex logger.debug('Checking videosUpdate parameters', { parameters: req.body }) - checkErrors(req, res, function () { - checkVideoExists(req.params.id, res, function () { + checkErrors(req, res, () => { + checkVideoExists(req.params.id, res, () => { // We need to make additional checks if (res.locals.video.isOwned() === false) { return res.status(403).send('Cannot update video of another pod') @@ -75,7 +75,7 @@ function videosGetValidator (req: express.Request, res: express.Response, next: logger.debug('Checking videosGet parameters', { parameters: req.params }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { checkVideoExists(req.params.id, res, next) }) } @@ -85,12 +85,12 @@ function videosRemoveValidator (req: express.Request, res: express.Response, nex logger.debug('Checking videosRemove parameters', { parameters: req.params }) - checkErrors(req, res, function () { - checkVideoExists(req.params.id, res, function () { + checkErrors(req, res, () => { + checkVideoExists(req.params.id, res, () => { // We need to make additional checks // Check if the user who did the request is able to delete the video - checkUserCanDeleteVideo(res.locals.oauth.token.User.id, res, function () { + checkUserCanDeleteVideo(res.locals.oauth.token.User.id, res, () => { next() }) }) @@ -113,7 +113,7 @@ function videoAbuseReportValidator (req: express.Request, res: express.Response, logger.debug('Checking videoAbuseReport parameters', { parameters: req.body }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { checkVideoExists(req.params.id, res, next) }) } @@ -124,7 +124,7 @@ function videoRateValidator (req: express.Request, res: express.Response, next: logger.debug('Checking videoRate parameters', { parameters: req.body }) - checkErrors(req, res, function () { + checkErrors(req, res, () => { checkVideoExists(req.params.id, res, next) }) } @@ -134,8 +134,8 @@ function videosBlacklistValidator (req: express.Request, res: express.Response, logger.debug('Checking videosBlacklist parameters', { parameters: req.params }) - checkErrors(req, res, function () { - checkVideoExists(req.params.id, res, function () { + checkErrors(req, res, () => { + checkVideoExists(req.params.id, res, () => { checkVideoIsBlacklistable(req, res, next) }) }) -- cgit v1.2.3