diff options
author | Josh Morel <morel.josh@hotmail.com> | 2019-04-02 05:26:47 -0400 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-04-02 11:26:47 +0200 |
commit | 7ccddd7b5250bd25a917a6e77e58b87b9484a2a4 (patch) | |
tree | e75dc991369c1768804fefa114eb2a832881087f /server/lib/job-queue/handlers/video-transcoding.ts | |
parent | 12fed49ebab0c414713d57ea316b6488ae6bef99 (diff) | |
download | PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.gz PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.zst PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.zip |
add quarantine videos feature (#1637)
* add quarantine videos feature
* increase Notification settings test timeout
to 20000ms. was completing 7000 locally but timing out
after 10000 on travis
* fix quarantine video test issues
-propagate misspelling
-remove skip from server/tests/client.ts
* WIP use blacklist for moderator video approval
instead of video.quarantine boolean
* finish auto-blacklist feature
Diffstat (limited to 'server/lib/job-queue/handlers/video-transcoding.ts')
-rw-r--r-- | server/lib/job-queue/handlers/video-transcoding.ts | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts index d9dad795e..581ec283e 100644 --- a/server/lib/job-queue/handlers/video-transcoding.ts +++ b/server/lib/job-queue/handlers/video-transcoding.ts | |||
@@ -85,10 +85,9 @@ async function publishVideoIfNeeded (video: VideoModel, payload?: VideoTranscodi | |||
85 | return { videoDatabase, videoPublished } | 85 | return { videoDatabase, videoPublished } |
86 | }) | 86 | }) |
87 | 87 | ||
88 | // don't notify prior to scheduled video update | 88 | if (videoPublished) { |
89 | if (videoPublished && !videoDatabase.ScheduleVideoUpdate) { | ||
90 | Notifier.Instance.notifyOnNewVideo(videoDatabase) | 89 | Notifier.Instance.notifyOnNewVideo(videoDatabase) |
91 | Notifier.Instance.notifyOnPendingVideoPublished(videoDatabase) | 90 | Notifier.Instance.notifyOnVideoPublishedAfterTranscoding(videoDatabase) |
92 | } | 91 | } |
93 | 92 | ||
94 | await createHlsJobIfEnabled(payload) | 93 | await createHlsJobIfEnabled(payload) |
@@ -146,11 +145,8 @@ async function onVideoFileOptimizerSuccess (videoArg: VideoModel, payload: Video | |||
146 | return { videoDatabase, videoPublished } | 145 | return { videoDatabase, videoPublished } |
147 | }) | 146 | }) |
148 | 147 | ||
149 | // don't notify prior to scheduled video update | 148 | if (payload.isNewVideo) Notifier.Instance.notifyOnNewVideo(videoDatabase) |
150 | if (!videoDatabase.ScheduleVideoUpdate) { | 149 | if (videoPublished) Notifier.Instance.notifyOnVideoPublishedAfterTranscoding(videoDatabase) |
151 | if (payload.isNewVideo) Notifier.Instance.notifyOnNewVideo(videoDatabase) | ||
152 | if (videoPublished) Notifier.Instance.notifyOnPendingVideoPublished(videoDatabase) | ||
153 | } | ||
154 | 150 | ||
155 | await createHlsJobIfEnabled(Object.assign({}, payload, { resolution: videoDatabase.getOriginalFile().resolution })) | 151 | await createHlsJobIfEnabled(Object.assign({}, payload, { resolution: videoDatabase.getOriginalFile().resolution })) |
156 | } | 152 | } |