parseQueryStringFilter cleanup

[github/Chocobozzz/PeerTube.git] / server / lib / video-blacklist.ts

diff --git a/server/lib/video-blacklist.ts b/server/lib/video-blacklist.ts
index 9749ce2f6cbc282e2bc69100be302fd954c78699..3b90b1b9415982071d6deff43dacbeb18ec47b59 100644 (file)
--- a/server/lib/video-blacklist.ts
+++ b/server/lib/video-blacklist.ts
@@ -2,21 +2,22 @@ import { Transaction } from 'sequelize'
 import { CONFIG } from '../initializers/config'
 import { UserRight, VideoBlacklistType } from '../../shared/models'
 import { VideoBlacklistModel } from '../models/video/video-blacklist'
-import { UserModel } from '../models/account/user'
-import { VideoModel } from '../models/video/video'
 import { logger } from '../helpers/logger'
 import { UserAdminFlag } from '../../shared/models/users/user-flag.model'
 import { Hooks } from './plugins/hooks'
+import { Notifier } from './notifier'
+import { MUser, MVideoBlacklistVideo, MVideoWithBlacklistLight } from '@server/typings/models'
 
 async function autoBlacklistVideoIfNeeded (parameters: {
-  video: VideoModel,
-  user?: UserModel,
-  isRemote: boolean,
-  isNew: boolean,
+  video: MVideoWithBlacklistLight
+  user?: MUser
+  isRemote: boolean
+  isNew: boolean
+  notify?: boolean
   transaction?: Transaction
 }) {
-  const { video, user, isRemote, isNew, transaction } = parameters
-  const doAutoBlacklist = await Hooks.wrapPromiseFun(
+  const { video, user, isRemote, isNew, notify = true, transaction } = parameters
+  const doAutoBlacklist = await Hooks.wrapFun(
     autoBlacklistNeeded,
     { video, user, isRemote, isNew },
     'filter:video.auto-blacklist.result'
@@ -30,33 +31,36 @@ async function autoBlacklistVideoIfNeeded (parameters: {
     reason: 'Auto-blacklisted. Moderator review required.',
     type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
   }
-  const [ videoBlacklist ] = await VideoBlacklistModel.findOrCreate({
+  const [ videoBlacklist ] = await VideoBlacklistModel.findOrCreate<MVideoBlacklistVideo>({
     where: {
       videoId: video.id
     },
     defaults: videoBlacklistToCreate,
     transaction
   })
-
   video.VideoBlacklist = videoBlacklist
 
+  videoBlacklist.Video = video
+
+  if (notify) Notifier.Instance.notifyOnVideoAutoBlacklist(videoBlacklist)
+
   logger.info('Video %s auto-blacklisted.', video.uuid)
 
   return true
 }
 
-async function autoBlacklistNeeded (parameters: {
-  video: VideoModel,
-  isRemote: boolean,
-  isNew: boolean,
-  user?: UserModel
+function autoBlacklistNeeded (parameters: {
+  video: MVideoWithBlacklistLight
+  isRemote: boolean
+  isNew: boolean
+  user?: MUser
 }) {
   const { user, video, isRemote, isNew } = parameters
 
   // Already blacklisted
   if (video.VideoBlacklist) return false
   if (!CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED || !user) return false
-  if (isRemote || isNew) return false
+  if (isRemote || isNew === false) return false
 
   if (user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) || user.hasAdminFlag(UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST)) return false