X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-update.ts;h=4afdbd430576edecfe86043db69fc55713c93faa;hb=47d883de2efbc2e8b5f6f94ae18c15224cbe982b;hp=a47d605d82fbf6b4d5c1434f710f0529488ba054;hpb=00aab0666c6f772548c160fdfa871a8843b88f37;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index a47d605d8..4afdbd430 100644
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -1,21 +1,20 @@
-import { ActivityUpdate, CacheFileObject, VideoTorrentObject } from '../../../../shared/models/activitypub'
+import { isRedundancyAccepted } from '@server/lib/redundancy'
+import { ActivityUpdate, CacheFileObject, VideoObject } from '../../../../shared/models/activitypub'
 import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor'
-import { resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers/database-utils'
-import { logger } from '../../../helpers/logger'
-import { sequelizeTypescript } from '../../../initializers'
-import { AccountModel } from '../../../models/account/account'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { VideoChannelModel } from '../../../models/video/video-channel'
-import { getAvatarInfoIfExists, updateActorAvatarInstance, updateActorInstance } from '../actor'
-import { getOrCreateVideoAndAccountAndChannel, getOrCreateVideoChannelFromVideoObject, updateVideoFromAP } from '../videos'
-import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos'
+import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
 import { isCacheFileObjectValid } from '../../../helpers/custom-validators/activitypub/cache-file'
+import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger } from '../../../helpers/logger'
+import { sequelizeTypescript } from '../../../initializers/database'
+import { ActorModel } from '../../../models/actor/actor'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorFull, MActorSignature } from '../../../types/models'
+import { APActorUpdater } from '../actors/updater'
 import { createOrUpdateCacheFile } from '../cache-file'
-import { forwardVideoRelatedActivity } from '../send/utils'
-import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
-import { createOrUpdateVideoPlaylist } from '../playlist'
-import { APProcessorOptions } from '../../../typings/activitypub-processor.model'
-import { MActorSignature, MAccountIdActor } from '../../../typings/models'
+import { createOrUpdateVideoPlaylist } from '../playlists'
+import { forwardVideoRelatedActivity } from '../send/shared/send-utils'
+import { APVideoUpdater, getOrCreateAPVideo } from '../videos'
 
 async function processUpdateActivity (options: APProcessorOptions<ActivityUpdate>) {
   const { activity, byActor } = options
@@ -23,7 +22,7 @@ async function processUpdateActivity (options: APProcessorOptions<ActivityUpdate
   const objectType = activity.object.type
 
   if (objectType === 'Video') {
-    return retryTransactionWrapper(processUpdateVideo, byActor, activity)
+    return retryTransactionWrapper(processUpdateVideo, activity)
   }
 
   if (objectType === 'Person' || objectType === 'Application' || objectType === 'Group') {
@@ -53,31 +52,29 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function processUpdateVideo (actor: MActorSignature, activity: ActivityUpdate) {
-  const videoObject = activity.object as VideoTorrentObject
+async function processUpdateVideo (activity: ActivityUpdate) {
+  const videoObject = activity.object as VideoObject
 
   if (sanitizeAndCheckVideoTorrentObject(videoObject) === false) {
     logger.debug('Video sent by update is not valid.', { videoObject })
     return undefined
   }
 
-  const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoObject.id, allowRefresh: false, fetchType: 'all' })
-  const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject)
-
-  const account = actor.Account as MAccountIdActor
-  account.Actor = actor
+  const { video, created } = await getOrCreateAPVideo({
+    videoObject: videoObject.id,
+    allowRefresh: false,
+    fetchType: 'all'
+  })
+  // We did not have this video, it has been created so no need to update
+  if (created) return
 
-  const updateOptions = {
-    video,
-    videoObject,
-    account,
-    channel: channelActor.VideoChannel,
-    overrideTo: activity.to
-  }
-  return updateVideoFromAP(updateOptions)
+  const updater = new APVideoUpdater(videoObject, video)
+  return updater.update(activity.to)
 }
 
 async function processUpdateCacheFile (byActor: MActorSignature, activity: ActivityUpdate) {
+  if (await isRedundancyAccepted(activity, byActor) !== true) return
+
   const cacheFileObject = activity.object as CacheFileObject
 
   if (!isCacheFileObjectValid(cacheFileObject)) {
@@ -85,7 +82,7 @@ async function processUpdateCacheFile (byActor: MActorSignature, activity: Activ
     return undefined
   }
 
-  const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFileObject.object })
+  const { video } = await getOrCreateAPVideo({ videoObject: cacheFileObject.object })
 
   await sequelizeTypescript.transaction(async t => {
     await createOrUpdateCacheFile(cacheFileObject, video, byActor, t)
@@ -99,58 +96,13 @@ async function processUpdateCacheFile (byActor: MActorSignature, activity: Activ
   }
 }
 
-async function processUpdateActor (actor: ActorModel, activity: ActivityUpdate) {
-  const actorAttributesToUpdate = activity.object as ActivityPubActor
-
-  logger.debug('Updating remote account "%s".', actorAttributesToUpdate.url)
-  let accountOrChannelInstance: AccountModel | VideoChannelModel
-  let actorFieldsSave: object
-  let accountOrChannelFieldsSave: object
-
-  // Fetch icon?
-  const avatarInfo = await getAvatarInfoIfExists(actorAttributesToUpdate)
+async function processUpdateActor (actor: MActorFull, activity: ActivityUpdate) {
+  const actorObject = activity.object as ActivityPubActor
 
-  try {
-    await sequelizeTypescript.transaction(async t => {
-      actorFieldsSave = actor.toJSON()
+  logger.debug('Updating remote account "%s".', actorObject.url)
 
-      if (actorAttributesToUpdate.type === 'Group') accountOrChannelInstance = actor.VideoChannel
-      else accountOrChannelInstance = actor.Account
-
-      accountOrChannelFieldsSave = accountOrChannelInstance.toJSON()
-
-      await updateActorInstance(actor, actorAttributesToUpdate)
-
-      if (avatarInfo !== undefined) {
-        const avatarOptions = Object.assign({}, avatarInfo, { onDisk: false })
-
-        await updateActorAvatarInstance(actor, avatarOptions, t)
-      }
-
-      await actor.save({ transaction: t })
-
-      accountOrChannelInstance.name = actorAttributesToUpdate.name || actorAttributesToUpdate.preferredUsername
-      accountOrChannelInstance.description = actorAttributesToUpdate.summary
-
-      if (accountOrChannelInstance instanceof VideoChannelModel) accountOrChannelInstance.support = actorAttributesToUpdate.support
-
-      await accountOrChannelInstance.save({ transaction: t })
-    })
-
-    logger.info('Remote account %s updated', actorAttributesToUpdate.url)
-  } catch (err) {
-    if (actor !== undefined && actorFieldsSave !== undefined) {
-      resetSequelizeInstance(actor, actorFieldsSave)
-    }
-
-    if (accountOrChannelInstance !== undefined && accountOrChannelFieldsSave !== undefined) {
-      resetSequelizeInstance(accountOrChannelInstance, accountOrChannelFieldsSave)
-    }
-
-    // This is just a debug because we will retry the insert
-    logger.debug('Cannot update the remote account.', { err })
-    throw err
-  }
+  const updater = new APActorUpdater(actorObject, actor)
+  return updater.update()
 }
 
 async function processUpdatePlaylist (byActor: MActorSignature, activity: ActivityUpdate) {
@@ -159,5 +111,5 @@ async function processUpdatePlaylist (byActor: MActorSignature, activity: Activi
 
   if (!byAccount) throw new Error('Cannot update video playlist with the non account actor ' + byActor.url)
 
-  await createOrUpdateVideoPlaylist(playlistObject, byAccount, activity.to)
+  await createOrUpdateVideoPlaylist(playlistObject, activity.to)
 }