From 5b77537ce54832f47931ba47dc513be2a9197f92 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 23 Jul 2019 12:04:15 +0200 Subject: Correctly notify on auto blacklist --- server/lib/job-queue/handlers/video-import.ts | 4 ++-- server/lib/job-queue/handlers/video-transcoding.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'server/lib/job-queue') diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index 50e159245..13b741180 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts @@ -199,10 +199,10 @@ async function processFile (downloader: () => Promise, videoImport: Vide Notifier.Instance.notifyOnFinishedVideoImport(videoImportUpdated, true) - if (videoImportUpdated.Video.VideoBlacklist) { + if (videoImportUpdated.Video.isBlacklisted()) { Notifier.Instance.notifyOnVideoAutoBlacklist(videoImportUpdated.Video) } else { - Notifier.Instance.notifyOnNewVideo(videoImportUpdated.Video) + Notifier.Instance.notifyOnNewVideoIfNeeded(videoImportUpdated.Video) } // Create transcoding jobs? diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts index e9b84ecd6..981daf9a1 100644 --- a/server/lib/job-queue/handlers/video-transcoding.ts +++ b/server/lib/job-queue/handlers/video-transcoding.ts @@ -112,7 +112,7 @@ async function publishNewResolutionIfNeeded (video: VideoModel, payload?: NewRes }) if (videoPublished) { - Notifier.Instance.notifyOnNewVideo(videoDatabase) + Notifier.Instance.notifyOnNewVideoIfNeeded(videoDatabase) Notifier.Instance.notifyOnVideoPublishedAfterTranscoding(videoDatabase) } @@ -172,7 +172,7 @@ async function onVideoFileOptimizerSuccess (videoArg: VideoModel, payload: Optim return { videoDatabase, videoPublished } }) - if (payload.isNewVideo) Notifier.Instance.notifyOnNewVideo(videoDatabase) + if (payload.isNewVideo) Notifier.Instance.notifyOnNewVideoIfNeeded(videoDatabase) if (videoPublished) Notifier.Instance.notifyOnVideoPublishedAfterTranscoding(videoDatabase) const hlsPayload = Object.assign({}, payload, { resolution: videoDatabase.getOriginalFile().resolution }) -- cgit v1.2.3