-function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
- const blacklistedVideo = res.locals.blacklistedVideo as BlacklistedVideoInstance
-
- blacklistedVideo.destroy()
- .then(() => {
- logger.info('Video %s removed from blacklist.', res.locals.video.uuid)
- res.sendStatus(204)
- })
- .catch(err => {
- logger.error('Some error while removing video %s from blacklist.', res.locals.video.uuid, err)
- next(err)
- })
+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()