X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo-blacklist.ts;h=1dd45b76d9d1fe742c52d4beef611aa991f357e6;hb=e612209767ebe1deb0af7688c96b7f979bb52b44;hp=9bc996f5a84d0f15cf2a29a9a257ba39f551e161;hpb=89cd12756035a146bbcc4db78cd3cd64f2f3d88d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/video-blacklist.ts b/server/lib/video-blacklist.ts
index 9bc996f5a..1dd45b76d 100644
--- a/server/lib/video-blacklist.ts
+++ b/server/lib/video-blacklist.ts
@@ -2,16 +2,24 @@ 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 (video: VideoModel, user?: UserModel, transaction?: Transaction) {
+async function autoBlacklistVideoIfNeeded (parameters: {
+  video: MVideoWithBlacklistLight,
+  user?: MUser,
+  isRemote: boolean,
+  isNew: boolean,
+  notify?: boolean,
+  transaction?: Transaction
+}) {
+  const { video, user, isRemote, isNew, notify = true, transaction } = parameters
   const doAutoBlacklist = await Hooks.wrapPromiseFun(
     autoBlacklistNeeded,
-    { video, user },
+    { video, user, isRemote, isNew },
     'filter:video.auto-blacklist.result'
   )
 
@@ -23,17 +31,36 @@ async function autoBlacklistVideoIfNeeded (video: VideoModel, user?: UserModel,
     reason: 'Auto-blacklisted. Moderator review required.',
     type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
   }
-  await VideoBlacklistModel.create(videoBlacklistToCreate, { transaction })
+  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, user?: UserModel }) {
-  const { user } = parameters
+async 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 === false) return false
 
   if (user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) || user.hasAdminFlag(UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST)) return false