import * as express from 'express'
-
-import { database as db } from '../../../initializers'
-import { logger, getFormattedObjects } from '../../../helpers'
+import { BlacklistedVideo, UserRight } from '../../../../shared'
+import { logger } from '../../../helpers/logger'
+import { getFormattedObjects } from '../../../helpers/utils'
import {
- authenticate,
- ensureUserHasRight,
- videosBlacklistAddValidator,
- videosBlacklistRemoveValidator,
- paginationValidator,
- blacklistSortValidator,
- setBlacklistSort,
- setPagination,
- asyncMiddleware
+ asyncMiddleware, authenticate, blacklistSortValidator, ensureUserHasRight, paginationValidator, setBlacklistSort, setDefaultPagination,
+ videosBlacklistAddValidator, videosBlacklistRemoveValidator
} from '../../../middlewares'
-import { BlacklistedVideoInstance } from '../../../models'
-import { BlacklistedVideo, UserRight } from '../../../../shared'
+import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
const blacklistRouter = express.Router()
blacklistRouter.post('/:videoId/blacklist',
authenticate,
ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
- videosBlacklistAddValidator,
+ asyncMiddleware(videosBlacklistAddValidator),
asyncMiddleware(addVideoToBlacklist)
)
paginationValidator,
blacklistSortValidator,
setBlacklistSort,
- setPagination,
+ setDefaultPagination,
asyncMiddleware(listBlacklist)
)
blacklistRouter.delete('/:videoId/blacklist',
authenticate,
ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
- videosBlacklistRemoveValidator,
+ asyncMiddleware(videosBlacklistRemoveValidator),
asyncMiddleware(removeVideoFromBlacklistController)
)
videoId: videoInstance.id
}
- await db.BlacklistedVideo.create(toCreate)
+ await VideoBlacklistModel.create(toCreate)
return res.type('json').status(204).end()
}
async function listBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await db.BlacklistedVideo.listForApi(req.query.start, req.query.count, req.query.sort)
+ const resultList = await VideoBlacklistModel.listForApi(req.query.start, req.query.count, req.query.sort)
- return res.json(getFormattedObjects<BlacklistedVideo, BlacklistedVideoInstance>(resultList.data, resultList.total))
+ return res.json(getFormattedObjects<BlacklistedVideo, VideoBlacklistModel>(resultList.data, resultList.total))
}
async function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
- const blacklistedVideo = res.locals.blacklistedVideo as BlacklistedVideoInstance
+ const blacklistedVideo = res.locals.blacklistedVideo as VideoBlacklistModel
try {
await blacklistedVideo.destroy()
return res.sendStatus(204)
} catch (err) {
- logger.error('Some error while removing video %s from blacklist.', res.locals.video.uuid, err)
+ logger.error('Some error while removing video %s from blacklist.', res.locals.video.uuid, { err })
throw err
}
}