Fix public video we set to public or unlisted

[github/Chocobozzz/PeerTube.git] / server / controllers / api / videos / blacklist.ts

diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts
index db6d95e73d907af47f512f1012d44c75ba62fd33..be7cf6ea4ada4602c57b7c8d50b6c64bdfb4eefe 100644 (file)
--- a/server/controllers/api/videos/blacklist.ts
+++ b/server/controllers/api/videos/blacklist.ts
@@ -1,20 +1,45 @@
-import express = require('express')
+import * as express from 'express'
 
-const db = require('../../../initializers/database')
-import { logger } from '../../../helpers'
+import { database as db } from '../../../initializers'
+import { logger, getFormattedObjects } from '../../../helpers'
 import {
   authenticate,
-  ensureIsAdmin,
-  videosBlacklistValidator
+  ensureUserHasRight,
+  videosBlacklistAddValidator,
+  videosBlacklistRemoveValidator,
+  paginationValidator,
+  blacklistSortValidator,
+  setBlacklistSort,
+  setPagination,
+  asyncMiddleware
 } from '../../../middlewares'
+import { BlacklistedVideoInstance } from '../../../models'
+import { BlacklistedVideo, UserRight } from '../../../../shared'
 
 const blacklistRouter = express.Router()
 
-blacklistRouter.post('/:id/blacklist',
+blacklistRouter.post('/:videoId/blacklist',
   authenticate,
-  ensureIsAdmin,
-  videosBlacklistValidator,
-  addVideoToBlacklist
+  ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+  videosBlacklistAddValidator,
+  asyncMiddleware(addVideoToBlacklist)
+)
+
+blacklistRouter.get('/blacklist',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+  paginationValidator,
+  blacklistSortValidator,
+  setBlacklistSort,
+  setPagination,
+  asyncMiddleware(listBlacklist)
+)
+
+blacklistRouter.delete('/:videoId/blacklist',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+  videosBlacklistRemoveValidator,
+  asyncMiddleware(removeVideoFromBlacklistController)
 )
 
 // ---------------------------------------------------------------------------
@@ -25,19 +50,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 db.BlacklistedVideo.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)
+
+  return res.json(getFormattedObjects<BlacklistedVideo, BlacklistedVideoInstance>(resultList.data, resultList.total))
+}
+
+async function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const blacklistedVideo = res.locals.blacklistedVideo as BlacklistedVideoInstance
 
-    return res.type('json').status(204).end()
-  })
+  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
+  }
 }