X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fblacklist.ts;h=c9087fd97ed744caece8c2ae835d9e02ce017eda;hb=4cb6d4578893db310297d7e118ce2fb7ecb952a3;hp=58960798bd503cfd2978f411a9352f3d9a795686;hpb=4d4e5cd4dca78480ec7f40e747f424cd107376a4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts
index 58960798b..c9087fd97 100644
--- a/server/controllers/api/videos/blacklist.ts
+++ b/server/controllers/api/videos/blacklist.ts
@@ -1,20 +1,37 @@
 import * as express from 'express'
-
-import { database as db } from '../../../initializers/database'
-import { logger } from '../../../helpers'
+import { BlacklistedVideo, UserRight } from '../../../../shared'
+import { logger } from '../../../helpers/logger'
+import { getFormattedObjects } from '../../../helpers/utils'
 import {
-  authenticate,
-  ensureIsAdmin,
-  videosBlacklistValidator
+  asyncMiddleware, authenticate, blacklistSortValidator, ensureUserHasRight, paginationValidator, setBlacklistSort, setPagination,
+  videosBlacklistAddValidator, videosBlacklistRemoveValidator
 } from '../../../middlewares'
+import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
 
 const blacklistRouter = express.Router()
 
-blacklistRouter.post('/:id/blacklist',
+blacklistRouter.post('/:videoId/blacklist',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+  asyncMiddleware(videosBlacklistAddValidator),
+  asyncMiddleware(addVideoToBlacklist)
+)
+
+blacklistRouter.get('/blacklist',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+  paginationValidator,
+  blacklistSortValidator,
+  setBlacklistSort,
+  setPagination,
+  asyncMiddleware(listBlacklist)
+)
+
+blacklistRouter.delete('/:videoId/blacklist',
   authenticate,
-  ensureIsAdmin,
-  videosBlacklistValidator,
-  addVideoToBlacklist
+  ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+  asyncMiddleware(videosBlacklistRemoveValidator),
+  asyncMiddleware(removeVideoFromBlacklistController)
 )
 
 // ---------------------------------------------------------------------------
@@ -25,19 +42,34 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function addVideoToBlacklist (req, res, next) {
+async function addVideoToBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) {
   const videoInstance = res.locals.video
 
   const toCreate = {
     videoId: videoInstance.id
   }
 
-  db.BlacklistedVideo.create(toCreate).asCallback(function (err) {
-    if (err) {
-      logger.error('Errors when blacklisting video ', { error: err })
-      return next(err)
-    }
+  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 VideoBlacklistModel.listForApi(req.query.start, req.query.count, req.query.sort)
+
+  return res.json(getFormattedObjects<BlacklistedVideo, VideoBlacklistModel>(resultList.data, resultList.total))
+}
 
-    return res.type('json').status(204).end()
-  })
+async function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const blacklistedVideo = res.locals.blacklistedVideo as VideoBlacklistModel
+
+  try {
+    await blacklistedVideo.destroy()
+
+    logger.info('Video %s removed from blacklist.', res.locals.video.uuid)
+
+    return res.sendStatus(204)
+  } catch (err) {
+    logger.error('Some error while removing video %s from blacklist.', res.locals.video.uuid, err)
+    throw err
+  }
 }