7ccddd7b52
* add quarantine videos feature * increase Notification settings test timeout to 20000ms. was completing 7000 locally but timing out after 10000 on travis * fix quarantine video test issues -propagate misspelling -remove skip from server/tests/client.ts * WIP use blacklist for moderator video approval instead of video.quarantine boolean * finish auto-blacklist feature
140 lines
4.4 KiB
TypeScript
140 lines
4.4 KiB
TypeScript
import * as express from 'express'
|
|
import { VideoBlacklist, UserRight, VideoBlacklistCreate, VideoBlacklistType } from '../../../../shared'
|
|
import { logger } from '../../../helpers/logger'
|
|
import { getFormattedObjects } from '../../../helpers/utils'
|
|
import {
|
|
asyncMiddleware,
|
|
authenticate,
|
|
blacklistSortValidator,
|
|
ensureUserHasRight,
|
|
paginationValidator,
|
|
setBlacklistSort,
|
|
setDefaultPagination,
|
|
videosBlacklistAddValidator,
|
|
videosBlacklistRemoveValidator,
|
|
videosBlacklistUpdateValidator,
|
|
videosBlacklistFiltersValidator
|
|
} from '../../../middlewares'
|
|
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()
|
|
|
|
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,
|
|
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),
|
|
asyncMiddleware(videosBlacklistRemoveValidator),
|
|
asyncMiddleware(removeVideoFromBlacklistController)
|
|
)
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export {
|
|
blacklistRouter
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
async function addVideoToBlacklist (req: express.Request, res: express.Response) {
|
|
const videoInstance = res.locals.video
|
|
const body: VideoBlacklistCreate = req.body
|
|
|
|
const toCreate = {
|
|
videoId: videoInstance.id,
|
|
unfederated: body.unfederate === true,
|
|
reason: body.reason,
|
|
type: VideoBlacklistType.MANUAL
|
|
}
|
|
|
|
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, req.query.type)
|
|
|
|
return res.json(getFormattedObjects<VideoBlacklist, VideoBlacklistModel>(resultList.data, resultList.total))
|
|
}
|
|
|
|
async function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
|
|
const videoBlacklist = res.locals.videoBlacklist
|
|
const video = res.locals.video
|
|
|
|
const videoBlacklistType = await sequelizeTypescript.transaction(async t => {
|
|
const unfederated = videoBlacklist.unfederated
|
|
const videoBlacklistType = videoBlacklist.type
|
|
|
|
await videoBlacklist.destroy({ transaction: t })
|
|
|
|
// 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()
|
|
}
|