Improve tests when waiting pending jobs

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / process / process-update.ts

diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index 0dd657c2b2d26fee8478d7d4a839dc6fcca12438..1ebda46d33d784c076e6ba20d325f61c66987353 100644 (file)
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -1,7 +1,6 @@
 import * as Bluebird from 'bluebird'
-import { ActivityUpdate } from '../../../../shared/models/activitypub'
+import { ActivityUpdate, VideoTorrentObject } from '../../../../shared/models/activitypub'
 import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor'
-import { VideoTorrentObject } from '../../../../shared/models/activitypub/objects'
 import { retryTransactionWrapper } from '../../../helpers/database-utils'
 import { logger } from '../../../helpers/logger'
 import { resetSequelizeInstance } from '../../../helpers/utils'
@@ -14,10 +13,12 @@ import { VideoFileModel } from '../../../models/video/video-file'
 import { fetchAvatarIfExists, getOrCreateActorAndServerAndModel, updateActorAvatarInstance, updateActorInstance } from '../actor'
 import {
   generateThumbnailFromUrl,
-  getOrCreateAccountAndVideoAndChannel, getOrCreateVideoChannel,
+  getOrCreateAccountAndVideoAndChannel,
+  getOrCreateVideoChannel,
   videoActivityObjectToDBAttributes,
   videoFileActivityUrlToDBAttributes
 } from '../videos'
+import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos'
 
 async function processUpdateActivity (activity: ActivityUpdate) {
   const actor = await getOrCreateActorAndServerAndModel(activity.actor)
@@ -29,7 +30,7 @@ async function processUpdateActivity (activity: ActivityUpdate) {
     return processUpdateActor(actor, activity)
   }
 
-  return
+  return undefined
 }
 
 // ---------------------------------------------------------------------------
@@ -50,15 +51,20 @@ function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate) {
 }
 
 async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
-  const videoAttributesToUpdate = activity.object as VideoTorrentObject
+  const videoObject = activity.object as VideoTorrentObject
 
-  const res = await getOrCreateAccountAndVideoAndChannel(videoAttributesToUpdate.id)
+  if (sanitizeAndCheckVideoTorrentObject(videoObject) === false) {
+    logger.debug('Video sent by update is not valid.', { videoObject })
+    return undefined
+  }
+
+  const res = await getOrCreateAccountAndVideoAndChannel(videoObject.id)
 
   // Fetch video channel outside the transaction
-  const newVideoChannelActor = await getOrCreateVideoChannel(videoAttributesToUpdate)
+  const newVideoChannelActor = await getOrCreateVideoChannel(videoObject)
   const newVideoChannel = newVideoChannelActor.VideoChannel
 
-  logger.debug('Updating remote video "%s".', videoAttributesToUpdate.uuid)
+  logger.debug('Updating remote video "%s".', videoObject.uuid)
   let videoInstance = res.video
   let videoFieldsSave: any
 
@@ -76,7 +82,7 @@ async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
         throw new Error('Account ' + actor.url + ' does not own video channel ' + videoChannel.Actor.url)
       }
 
-      const videoData = await videoActivityObjectToDBAttributes(newVideoChannel, videoAttributesToUpdate, activity.to)
+      const videoData = await videoActivityObjectToDBAttributes(newVideoChannel, videoObject, activity.to)
       videoInstance.set('name', videoData.name)
       videoInstance.set('uuid', videoData.uuid)
       videoInstance.set('url', videoData.url)
@@ -87,6 +93,8 @@ async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
       videoInstance.set('support', videoData.support)
       videoInstance.set('nsfw', videoData.nsfw)
       videoInstance.set('commentsEnabled', videoData.commentsEnabled)
+      videoInstance.set('waitTranscoding', videoData.waitTranscoding)
+      videoInstance.set('state', videoData.state)
       videoInstance.set('duration', videoData.duration)
       videoInstance.set('createdAt', videoData.createdAt)
       videoInstance.set('updatedAt', videoData.updatedAt)
@@ -97,8 +105,8 @@ async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
       await videoInstance.save(sequelizeOptions)
 
       // Don't block on request
-      generateThumbnailFromUrl(videoInstance, videoAttributesToUpdate.icon)
-        .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoAttributesToUpdate.id, { err }))
+      generateThumbnailFromUrl(videoInstance, videoObject.icon)
+        .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoObject.id, { err }))
 
       // Remove old video files
       const videoFileDestroyTasks: Bluebird<void>[] = []
@@ -107,16 +115,16 @@ async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
       }
       await Promise.all(videoFileDestroyTasks)
 
-      const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoAttributesToUpdate)
+      const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoObject)
       const tasks = videoFileAttributes.map(f => VideoFileModel.create(f))
       await Promise.all(tasks)
 
-      const tags = videoAttributesToUpdate.tag.map(t => t.name)
+      const tags = videoObject.tag.map(t => t.name)
       const tagInstances = await TagModel.findOrCreateTags(tags, t)
       await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
     })
 
-    logger.info('Remote video with uuid %s updated', videoAttributesToUpdate.uuid)
+    logger.info('Remote video with uuid %s updated', videoObject.uuid)
   } catch (err) {
     if (videoInstance !== undefined && videoFieldsSave !== undefined) {
       resetSequelizeInstance(videoInstance, videoFieldsSave)