Fix integrity with transcoding jobs

1 files changed, 10 insertions, 3 deletions

diff --git a/server/lib/jobs/handlers/video-file-transcoder.ts b/server/lib/jobs/handlers/video-file-transcoder.ts
index b240ff58a..a8d80ed45 100644
--- a/server/lib/jobs/handlers/video-file-transcoder.ts
+++ b/server/lib/jobs/handlers/video-file-transcoder.ts
@@ -22,15 +22,22 @@ function onError (err: Error, jobId: number) {
   return Promise.resolve()
 }
 
-function onSuccess (jobId: number, video: VideoInstance) {
+async function onSuccess (jobId: number, video: VideoInstance) {
   if (video === undefined) return undefined
 
   logger.info('Job %d is a success.', jobId)
 
-  const remoteVideo = video.toUpdateRemoteJSON()
+  // Maybe the video changed in database, refresh it
+  const videoDatabase = await db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(video.uuid)
+  // Video does not exist anymore
+  if (!videoDatabase) return undefined
+
+  const remoteVideo = videoDatabase.toUpdateRemoteJSON()
 
   // Now we'll add the video's meta data to our friends
-  return updateVideoToFriends(remoteVideo, null)
+  await updateVideoToFriends(remoteVideo, null)
+
+  return
 }
 
 // ---------------------------------------------------------------------------