X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-update.ts;h=07a5ff92f1227936fb848e40d59c7461646b8d86;hb=1297eb5db651a230474670c5da1517862fb9cc3e;hp=11226e2753661637ba9031c3fa352e2eb2abaa6d;hpb=f6eebcb336c067e160a62020a5140d8d992ba384;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index 11226e275..07a5ff92f 100644
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -1,4 +1,3 @@
-import * as Bluebird from 'bluebird'
 import { ActivityUpdate, VideoTorrentObject } from '../../../../shared/models/activitypub'
 import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor'
 import { resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers/database-utils'
@@ -6,19 +5,10 @@ import { logger } from '../../../helpers/logger'
 import { sequelizeTypescript } from '../../../initializers'
 import { AccountModel } from '../../../models/account/account'
 import { ActorModel } from '../../../models/activitypub/actor'
-import { TagModel } from '../../../models/video/tag'
 import { VideoChannelModel } from '../../../models/video/video-channel'
-import { VideoFileModel } from '../../../models/video/video-file'
 import { fetchAvatarIfExists, getOrCreateActorAndServerAndModel, updateActorAvatarInstance, updateActorInstance } from '../actor'
-import {
-  generateThumbnailFromUrl,
-  getOrCreateAccountAndVideoAndChannel,
-  getOrCreateVideoChannel,
-  videoActivityObjectToDBAttributes,
-  videoFileActivityUrlToDBAttributes
-} from '../videos'
+import { getOrCreateVideoAndAccountAndChannel, getOrCreateVideoChannel, updateVideoFromAP } from '../videos'
 import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos'
-import { VideoCaptionModel } from '../../../models/video/video-caption'
 
 async function processUpdateActivity (activity: ActivityUpdate) {
   const actor = await getOrCreateActorAndServerAndModel(activity.actor)
@@ -49,91 +39,10 @@ async function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate)
     return undefined
   }
 
-  const res = await getOrCreateAccountAndVideoAndChannel(videoObject.id)
+  const { video } = await getOrCreateVideoAndAccountAndChannel(videoObject.id)
+  const channelActor = await getOrCreateVideoChannel(videoObject)
 
-  // Fetch video channel outside the transaction
-  const newVideoChannelActor = await getOrCreateVideoChannel(videoObject)
-  const newVideoChannel = newVideoChannelActor.VideoChannel
-
-  logger.debug('Updating remote video "%s".', videoObject.uuid)
-  let videoInstance = res.video
-  let videoFieldsSave: any
-
-  try {
-    await sequelizeTypescript.transaction(async t => {
-      const sequelizeOptions = {
-        transaction: t
-      }
-
-      videoFieldsSave = videoInstance.toJSON()
-
-      // Check actor has the right to update the video
-      const videoChannel = videoInstance.VideoChannel
-      if (videoChannel.Account.Actor.id !== actor.id) {
-        throw new Error('Account ' + actor.url + ' does not own video channel ' + videoChannel.Actor.url)
-      }
-
-      const videoData = await videoActivityObjectToDBAttributes(newVideoChannel, videoObject, activity.to)
-      videoInstance.set('name', videoData.name)
-      videoInstance.set('uuid', videoData.uuid)
-      videoInstance.set('url', videoData.url)
-      videoInstance.set('category', videoData.category)
-      videoInstance.set('licence', videoData.licence)
-      videoInstance.set('language', videoData.language)
-      videoInstance.set('description', videoData.description)
-      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)
-      videoInstance.set('views', videoData.views)
-      videoInstance.set('privacy', videoData.privacy)
-      videoInstance.set('channelId', videoData.channelId)
-
-      await videoInstance.save(sequelizeOptions)
-
-      // Don't block on request
-      generateThumbnailFromUrl(videoInstance, videoObject.icon)
-        .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoObject.id, { err }))
-
-      // Remove old video files
-      const videoFileDestroyTasks: Bluebird<void>[] = []
-      for (const videoFile of videoInstance.VideoFiles) {
-        videoFileDestroyTasks.push(videoFile.destroy(sequelizeOptions))
-      }
-      await Promise.all(videoFileDestroyTasks)
-
-      const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoObject)
-      const tasks = videoFileAttributes.map(f => VideoFileModel.create(f, sequelizeOptions))
-      await Promise.all(tasks)
-
-      // Update Tags
-      const tags = videoObject.tag.map(tag => tag.name)
-      const tagInstances = await TagModel.findOrCreateTags(tags, t)
-      await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
-
-      // Update captions
-      await VideoCaptionModel.deleteAllCaptionsOfRemoteVideo(videoInstance.id, t)
-
-      const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => {
-        return VideoCaptionModel.insertOrReplaceLanguage(videoInstance.id, c.identifier, t)
-      })
-      await Promise.all(videoCaptionsPromises)
-    })
-
-    logger.info('Remote video with uuid %s updated', videoObject.uuid)
-  } catch (err) {
-    if (videoInstance !== undefined && videoFieldsSave !== undefined) {
-      resetSequelizeInstance(videoInstance, videoFieldsSave)
-    }
-
-    // This is just a debug because we will retry the insert
-    logger.debug('Cannot update the remote video.', { err })
-    throw err
-  }
+  return updateVideoFromAP(video, videoObject, actor, channelActor, activity.to)
 }
 
 async function processUpdateActor (actor: ActorModel, activity: ActivityUpdate) {