From ab683a8e0d998cfd9dfb9562d3c616f3e6e1dbfd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 26 Apr 2017 21:42:36 +0200 Subject: [PATCH] Format video blacklist --- client/src/app/videos/shared/video.service.ts | 4 +- .../video-watch/video-watch.component.html | 20 +++++----- .../video-watch/video-watch.component.ts | 40 ++++++++++--------- server/controllers/api/videos.js | 7 ++-- server/middlewares/admin.js | 3 +- server/middlewares/validators/videos.js | 30 +++++++------- server/models/video.js | 1 - 7 files changed, 53 insertions(+), 52 deletions(-) diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts index a0965e20c..ba83c72fd 100644 --- a/client/src/app/videos/shared/video.service.ts +++ b/client/src/app/videos/shared/video.service.ts @@ -152,8 +152,8 @@ export class VideoService { blacklistVideo(id: string) { return this.authHttp.post(VideoService.BASE_VIDEO_URL + id + '/blacklist', {}) - .map(this.restExtractor.extractDataBool) - .catch((res) => this.restExtractor.handleError(res)); + .map(this.restExtractor.extractDataBool) + .catch((res) => this.restExtractor.handleError(res)); } private setVideoRate(id: string, rateType: RateType) { diff --git a/client/src/app/videos/video-watch/video-watch.component.html b/client/src/app/videos/video-watch/video-watch.component.html index 124a3ba8b..5e758401e 100644 --- a/client/src/app/videos/video-watch/video-watch.component.html +++ b/client/src/app/videos/video-watch/video-watch.component.html @@ -79,17 +79,17 @@ -
  • - - Delete - -
    • +
  • + + Delete + +
    • -
  • - - Blacklist - -
    • +
  • + + Blacklist + +
    • diff --git a/client/src/app/videos/video-watch/video-watch.component.ts b/client/src/app/videos/video-watch/video-watch.component.ts index f582df45c..07b2a1d1f 100644 --- a/client/src/app/videos/video-watch/video-watch.component.ts +++ b/client/src/app/videos/video-watch/video-watch.component.ts @@ -171,41 +171,43 @@ export class VideoWatchComponent implements OnInit, OnDestroy { removeVideo(event: Event) { event.preventDefault(); + this.confirmService.confirm('Do you really want to delete this video?', 'Delete').subscribe( res => { if (res === false) return; this.videoService.removeVideo(this.video.id) - .subscribe( - status => { - this.notificationsService.success('Success', `Video ${this.video.name} deleted.`) - // Go back to the video-list. - this.router.navigate(['/videos/list']) - }, + .subscribe( + status => { + this.notificationsService.success('Success', `Video ${this.video.name} deleted.`); + // Go back to the video-list. + this.router.navigate(['/videos/list']); + }, - error => this.notificationsService.error('Error', error.text) - ); + error => this.notificationsService.error('Error', error.text) + ); } ); } blacklistVideo(event: Event) { - event.preventDefault() + event.preventDefault(); + this.confirmService.confirm('Do you really want to blacklist this video ?', 'Blacklist').subscribe( res => { - if (res === false) return; + if (res === false) return; - this.videoService.blacklistVideo(this.video.id) - .subscribe( - status => { - this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`) - this.router.navigate(['/videos/list']) - }, + this.videoService.blacklistVideo(this.video.id) + .subscribe( + status => { + this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`); + this.router.navigate(['/videos/list']); + }, - error => this.notificationsService.error('Error', error.text) - ) + error => this.notificationsService.error('Error', error.text) + ); } - ) + ); } showReportModal(event: Event) { diff --git a/server/controllers/api/videos.js b/server/controllers/api/videos.js index 1f7d30eef..0be7d9d83 100644 --- a/server/controllers/api/videos.js +++ b/server/controllers/api/videos.js @@ -635,10 +635,11 @@ function reportVideoAbuse (req, res, finalCallback) { function addVideoToBlacklist (req, res, next) { const videoInstance = res.locals.video - db.BlacklistedVideo.create({ + const toCreate = { videoId: videoInstance.id - }) - .asCallback(function (err) { + } + + db.BlacklistedVideo.create(toCreate).asCallback(function (err) { if (err) { logger.error('Errors when blacklisting video ', { error: err }) return next(err) diff --git a/server/middlewares/admin.js b/server/middlewares/admin.js index e6d9dc887..3288f4c6b 100644 --- a/server/middlewares/admin.js +++ b/server/middlewares/admin.js @@ -1,6 +1,5 @@ 'use strict' -const constants = require('../initializers/constants') const logger = require('../helpers/logger') const adminMiddleware = { @@ -9,7 +8,7 @@ const adminMiddleware = { function ensureIsAdmin (req, res, next) { const user = res.locals.oauth.token.user - if (user.role !== constants.USER_ROLES.ADMIN) { + if (user.isAdmin() === false) { logger.info('A non admin user is trying to access to an admin content.') return res.sendStatus(403) } diff --git a/server/middlewares/validators/videos.js b/server/middlewares/validators/videos.js index 86a7e39ae..f18ca1597 100644 --- a/server/middlewares/validators/videos.js +++ b/server/middlewares/validators/videos.js @@ -137,6 +137,18 @@ function videoRate (req, res, next) { }) } +function videosBlacklist (req, res, next) { + req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4) + + logger.debug('Checking videosBlacklist parameters', { parameters: req.params }) + + checkErrors(req, res, function () { + checkVideoExists(req.params.id, res, function () { + checkVideoIsBlacklistable(req, res, next) + }) + }) +} + // --------------------------------------------------------------------------- module.exports = validatorsVideos @@ -166,8 +178,8 @@ function checkUserCanDeleteVideo (userId, res, callback) { } // Check if the user can delete the video - // The user can delete it if s/he an admin - // Or if s/he is the video's author + // The user can delete it if s/he is an admin + // Or if s/he is the video's author if (user.isAdmin() === false) { if (res.locals.video.isOwned() === false) { return res.status(403).send('Cannot remove video of another pod') @@ -185,20 +197,8 @@ function checkUserCanDeleteVideo (userId, res, callback) { function checkVideoIsBlacklistable (req, res, callback) { if (res.locals.video.isOwned() === true) { - return res.status(403).send('Cannot blacklist a local video') + return res.status(403).send('Cannot blacklist a local video') } callback() } - -function videosBlacklist (req, res, next) { - req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4) - - logger.debug('Checking videosBlacklist parameters', { parameters: req.params }) - - checkErrors(req, res, function () { - checkVideoExists(req.params.id, res, function() { - checkVideoIsBlacklistable(req, res, next) - }) - }) -} diff --git a/server/models/video.js b/server/models/video.js index 1addfa682..0eef4114c 100644 --- a/server/models/video.js +++ b/server/models/video.js @@ -770,7 +770,6 @@ function removeFromBlacklist (video, callback) { // If an error occured, stop here if (err) { logger.error('Error when fetching video from blacklist.', { error: err }) - return callback(err) }