X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fblacklist.ts;h=abd09387cf45b44cde1d71101541ba14b65f6efd;hb=feb34f6b6b991046aab6a10df747b48fa4da07a7;hp=d08c6e13f0e6c4a614e0aae5fa306715f1141f76;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts
index d08c6e13f..abd09387c 100644
--- a/server/controllers/api/videos/blacklist.ts
+++ b/server/controllers/api/videos/blacklist.ts
@@ -1,18 +1,26 @@
 import * as express from 'express'
-import { logger, getFormattedObjects } from '../../../helpers'
+import { UserRight, VideoBlacklistCreate, VideoBlacklistType } from '../../../../shared'
+import { logger } from '../../../helpers/logger'
+import { getFormattedObjects } from '../../../helpers/utils'
 import {
+  asyncMiddleware,
   authenticate,
+  blacklistSortValidator,
   ensureUserHasRight,
-  videosBlacklistAddValidator,
-  videosBlacklistRemoveValidator,
   paginationValidator,
-  blacklistSortValidator,
   setBlacklistSort,
-  setPagination,
-  asyncMiddleware
+  setDefaultPagination,
+  videosBlacklistAddValidator,
+  videosBlacklistFiltersValidator,
+  videosBlacklistRemoveValidator,
+  videosBlacklistUpdateValidator
 } from '../../../middlewares'
-import { BlacklistedVideo, UserRight } from '../../../../shared'
 import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
+import { sequelizeTypescript } from '../../../initializers'
+import { Notifier } from '../../../lib/notifier'
+import { sendDeleteVideo } from '../../../lib/activitypub/send'
+import { federateVideoIfNeeded } from '../../../lib/activitypub/videos'
+import { MVideoBlacklistVideo } from '@server/typings/models'
 
 const blacklistRouter = express.Router()
 
@@ -29,10 +37,18 @@ blacklistRouter.get('/blacklist',
   paginationValidator,
   blacklistSortValidator,
   setBlacklistSort,
-  setPagination,
+  setDefaultPagination,
+  videosBlacklistFiltersValidator,
   asyncMiddleware(listBlacklist)
 )
 
+blacklistRouter.put('/:videoId/blacklist',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
+  asyncMiddleware(videosBlacklistUpdateValidator),
+  asyncMiddleware(updateVideoBlacklistController)
+)
+
 blacklistRouter.delete('/:videoId/blacklist',
   authenticate,
   ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
@@ -48,34 +64,85 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function addVideoToBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const videoInstance = res.locals.video
+async function addVideoToBlacklist (req: express.Request, res: express.Response) {
+  const videoInstance = res.locals.videoAll
+  const body: VideoBlacklistCreate = req.body
 
   const toCreate = {
-    videoId: videoInstance.id
+    videoId: videoInstance.id,
+    unfederated: body.unfederate === true,
+    reason: body.reason,
+    type: VideoBlacklistType.MANUAL
   }
 
-  await VideoBlacklistModel.create(toCreate)
+  const blacklist: MVideoBlacklistVideo = await VideoBlacklistModel.create(toCreate)
+  blacklist.Video = videoInstance
+
+  if (body.unfederate === true) {
+    await sendDeleteVideo(videoInstance, undefined)
+  }
+
+  Notifier.Instance.notifyOnVideoBlacklist(blacklist)
+
+  logger.info('Video %s blacklisted.', videoInstance.uuid)
+
+  return res.type('json').status(204).end()
+}
+
+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').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)
+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<BlacklistedVideo, VideoBlacklistModel>(resultList.data, resultList.total))
+  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 
-async function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const blacklistedVideo = res.locals.blacklistedVideo as VideoBlacklistModel
+async function removeVideoFromBlacklistController (req: express.Request, res: express.Response) {
+  const videoBlacklist = res.locals.videoBlacklist
+  const video = res.locals.videoAll
 
-  try {
-    await blacklistedVideo.destroy()
+  const videoBlacklistType = await sequelizeTypescript.transaction(async t => {
+    const unfederated = videoBlacklist.unfederated
+    const videoBlacklistType = videoBlacklist.type
 
-    logger.info('Video %s removed from blacklist.', res.locals.video.uuid)
+    await videoBlacklist.destroy({ transaction: t })
+    video.VideoBlacklist = undefined
 
-    return res.sendStatus(204)
-  } catch (err) {
-    logger.error('Some error while removing video %s from blacklist.', res.locals.video.uuid, err)
-    throw err
+    // Re federate the video
+    if (unfederated === true) {
+      await federateVideoIfNeeded(video, true, t)
+    }
+
+    return videoBlacklistType
+  })
+
+  Notifier.Instance.notifyOnVideoUnblacklist(video)
+
+  if (videoBlacklistType === VideoBlacklistType.AUTO_BEFORE_PUBLISHED) {
+    Notifier.Instance.notifyOnVideoPublishedAfterRemovedFromAutoBlacklist(video)
+
+    // Delete on object so new video notifications will send
+    delete video.VideoBlacklist
+    Notifier.Instance.notifyOnNewVideoIfNeeded(video)
   }
+
+  logger.info('Video %s removed from blacklist.', video.uuid)
+
+  return res.type('json').status(204).end()
 }