import * as express from 'express'
-
-import { database as db } from '../../../initializers'
-import { logger, getFormattedObjects } from '../../../helpers'
+import { blacklistVideo, unblacklistVideo } from '@server/lib/video-blacklist'
+import { UserRight, VideoBlacklistCreate } from '../../../../shared'
+import { logger } from '../../../helpers/logger'
+import { getFormattedObjects } from '../../../helpers/utils'
+import { sequelizeTypescript } from '../../../initializers/database'
import {
+ asyncMiddleware,
authenticate,
- ensureIsAdmin,
- videosBlacklistAddValidator,
- videosBlacklistRemoveValidator,
- paginationValidator,
blacklistSortValidator,
+ ensureUserHasRight,
+ paginationValidator,
setBlacklistSort,
- setPagination
+ setDefaultPagination,
+ videosBlacklistAddValidator,
+ videosBlacklistFiltersValidator,
+ videosBlacklistRemoveValidator,
+ videosBlacklistUpdateValidator
} from '../../../middlewares'
-import { BlacklistedVideoInstance } from '../../../models'
-import { BlacklistedVideo } from '../../../../shared'
+import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
const blacklistRouter = express.Router()
blacklistRouter.post('/:videoId/blacklist',
authenticate,
- ensureIsAdmin,
- videosBlacklistAddValidator,
- addVideoToBlacklist
+ ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+ asyncMiddleware(videosBlacklistAddValidator),
+ asyncMiddleware(addVideoToBlacklistController)
)
blacklistRouter.get('/blacklist',
authenticate,
- ensureIsAdmin,
+ ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
paginationValidator,
blacklistSortValidator,
setBlacklistSort,
- setPagination,
- listBlacklist
+ setDefaultPagination,
+ videosBlacklistFiltersValidator,
+ asyncMiddleware(listBlacklist)
+)
+
+blacklistRouter.put('/:videoId/blacklist',
+ authenticate,
+ ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+ asyncMiddleware(videosBlacklistUpdateValidator),
+ asyncMiddleware(updateVideoBlacklistController)
)
blacklistRouter.delete('/:videoId/blacklist',
authenticate,
- ensureIsAdmin,
- videosBlacklistRemoveValidator,
- removeVideoFromBlacklistController
+ ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+ asyncMiddleware(videosBlacklistRemoveValidator),
+ asyncMiddleware(removeVideoFromBlacklistController)
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function addVideoToBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) {
- const videoInstance = res.locals.video
+async function addVideoToBlacklistController (req: express.Request, res: express.Response) {
+ const videoInstance = res.locals.videoAll
+ const body: VideoBlacklistCreate = req.body
+
+ await blacklistVideo(videoInstance, body)
- const toCreate = {
- videoId: videoInstance.id
- }
+ logger.info('Video %s blacklisted.', videoInstance.uuid)
- db.BlacklistedVideo.create(toCreate)
- .then(() => res.type('json').status(204).end())
- .catch(err => {
- logger.error('Errors when blacklisting video ', err)
- return next(err)
- })
+ return res.type('json').sendStatus(HttpStatusCode.NO_CONTENT_204)
}
-function listBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) {
- db.BlacklistedVideo.listForApi(req.query.start, req.query.count, req.query.sort)
- .then(resultList => res.json(getFormattedObjects<BlacklistedVideo, BlacklistedVideoInstance>(resultList.data, resultList.total)))
- .catch(err => next(err))
+async function updateVideoBlacklistController (req: express.Request, res: express.Response) {
+ const videoBlacklist = res.locals.videoBlacklist
+
+ if (req.body.reason !== undefined) videoBlacklist.reason = req.body.reason
+
+ await sequelizeTypescript.transaction(t => {
+ return videoBlacklist.save({ transaction: t })
+ })
+
+ return res.type('json').sendStatus(HttpStatusCode.NO_CONTENT_204)
}
-function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
- const blacklistedVideo = res.locals.blacklistedVideo as BlacklistedVideoInstance
-
- blacklistedVideo.destroy()
- .then(() => {
- logger.info('Video %s removed from blacklist.', res.locals.video.uuid)
- res.sendStatus(204)
- })
- .catch(err => {
- logger.error('Some error while removing video %s from blacklist.', res.locals.video.uuid, err)
- next(err)
- })
+async function listBlacklist (req: express.Request, res: express.Response) {
+ const resultList = await VideoBlacklistModel.listForApi({
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ search: req.query.search,
+ type: req.query.type
+ })
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+async function removeVideoFromBlacklistController (req: express.Request, res: express.Response) {
+ const videoBlacklist = res.locals.videoBlacklist
+ const video = res.locals.videoAll
+
+ await unblacklistVideo(videoBlacklist, video)
+
+ logger.info('Video %s removed from blacklist.', video.uuid)
+
+ return res.type('json').sendStatus(HttpStatusCode.NO_CONTENT_204)
}