import { Transaction } from 'sequelize'
+import { afterCommitIfTransaction } from '@server/helpers/database-utils'
import { sequelizeTypescript } from '@server/initializers/database'
import {
MUser,
MVideoBlacklistVideo,
MVideoFullLight,
MVideoWithBlacklistLight
-} from '@server/typings/models'
-import { UserRight, VideoBlacklistCreate, VideoBlockType } from '../../shared/models'
+} from '@server/types/models'
+import { LiveVideoError, UserRight, VideoBlacklistCreate, VideoBlacklistType } from '../../shared/models'
import { UserAdminFlag } from '../../shared/models/users/user-flag.model'
-import { logger } from '../helpers/logger'
+import { logger, loggerTagsFactory } from '../helpers/logger'
import { CONFIG } from '../initializers/config'
import { VideoBlacklistModel } from '../models/video/video-blacklist'
import { sendDeleteVideo } from './activitypub/send'
import { federateVideoIfNeeded } from './activitypub/videos'
+import { LiveManager } from './live/live-manager'
import { Notifier } from './notifier'
import { Hooks } from './plugins/hooks'
+const lTags = loggerTagsFactory('blacklist')
+
async function autoBlacklistVideoIfNeeded (parameters: {
video: MVideoWithBlacklistLight
user?: MUser
videoId: video.id,
unfederated: true,
reason: 'Auto-blacklisted. Moderator review required.',
- type: VideoBlockType.AUTO_BEFORE_PUBLISHED
+ type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
}
const [ videoBlacklist ] = await VideoBlacklistModel.findOrCreate<MVideoBlacklistVideo>({
where: {
videoBlacklist.Video = video
- if (notify) Notifier.Instance.notifyOnVideoAutoBlacklist(videoBlacklist)
+ if (notify) {
+ afterCommitIfTransaction(transaction, () => {
+ Notifier.Instance.notifyOnVideoAutoBlacklist(videoBlacklist)
+ })
+ }
- logger.info('Video %s auto-blacklisted.', video.uuid)
+ logger.info('Video %s auto-blacklisted.', video.uuid, lTags(video.uuid))
return true
}
videoId: videoInstance.id,
unfederated: options.unfederate === true,
reason: options.reason,
- type: VideoBlockType.MANUAL
- }
- )
+ type: VideoBlacklistType.MANUAL
+ })
blacklist.Video = videoInstance
if (options.unfederate === true) {
await sendDeleteVideo(videoInstance, undefined)
}
+ if (videoInstance.isLive) {
+ LiveManager.Instance.stopSessionOf(videoInstance.id, LiveVideoError.BLACKLISTED)
+ }
+
Notifier.Instance.notifyOnVideoBlacklist(blacklist)
}
Notifier.Instance.notifyOnVideoUnblacklist(video)
- if (videoBlacklistType === VideoBlockType.AUTO_BEFORE_PUBLISHED) {
+ if (videoBlacklistType === VideoBlacklistType.AUTO_BEFORE_PUBLISHED) {
Notifier.Instance.notifyOnVideoPublishedAfterRemovedFromAutoBlacklist(video)
// Delete on object so new video notifications will send
if (!CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED || !user) return false
if (isRemote || isNew === false) return false
- if (user.hasRight(UserRight.MANAGE_VIDEO_BLOCKS) || user.hasAdminFlag(UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK)) return false
+ if (user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) || user.hasAdminFlag(UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST)) return false
return true
}