import * as express from 'express'
-import { logger, getFormattedObjects } from '../../../helpers'
+import { VideoBlacklist, 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,
+ videosBlacklistRemoveValidator,
+ videosBlacklistUpdateValidator,
+ videosBlacklistFiltersValidator
} 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'
const blacklistRouter = express.Router()
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),
// ---------------------------------------------------------------------------
-async function addVideoToBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function addVideoToBlacklist (req: express.Request, res: express.Response) {
const videoInstance = res.locals.video
+ 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 = await VideoBlacklistModel.create(toCreate)
+ blacklist.Video = videoInstance
+
+ if (body.unfederate === true) {
+ await sendDeleteVideo(videoInstance, undefined)
+ }
+
+ Notifier.Instance.notifyOnVideoBlacklist(blacklist)
+
+ logger.info('Video %s blacklisted.', res.locals.video.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)
+ const resultList = await VideoBlacklistModel.listForApi(req.query.start, req.query.count, req.query.sort, req.query.type)
- return res.json(getFormattedObjects<BlacklistedVideo, VideoBlacklistModel>(resultList.data, resultList.total))
+ return res.json(getFormattedObjects<VideoBlacklist, VideoBlacklistModel>(resultList.data, resultList.total))
}
async function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
- const blacklistedVideo = res.locals.blacklistedVideo as VideoBlacklistModel
+ const videoBlacklist = res.locals.videoBlacklist
+ const video = res.locals.video
- 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 })
- 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.notifyOnNewVideo(video)
}
+
+ logger.info('Video %s removed from blacklist.', res.locals.video.uuid)
+
+ return res.type('json').status(204).end()
}