1 files changed, 20 insertions, 16 deletions

diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index 4afdbd430..9caa74e04 100644
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -1,5 +1,5 @@
 import { isRedundancyAccepted } from '@server/lib/redundancy'
-import { ActivityUpdate, CacheFileObject, VideoObject } from '../../../../shared/models/activitypub'
+import { ActivityUpdate, ActivityUpdateObject, CacheFileObject, VideoObject } from '../../../../shared/models/activitypub'
 import { ActivityPubActor } from '../../../../shared/models/activitypub/activitypub-actor'
 import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
 import { isCacheFileObjectValid } from '../../../helpers/custom-validators/activitypub/cache-file'
@@ -10,16 +10,18 @@ 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 { fetchAPObject } from '../activity'
 import { APActorUpdater } from '../actors/updater'
 import { createOrUpdateCacheFile } from '../cache-file'
 import { createOrUpdateVideoPlaylist } from '../playlists'
 import { forwardVideoRelatedActivity } from '../send/shared/send-utils'
 import { APVideoUpdater, getOrCreateAPVideo } from '../videos'
 
-async function processUpdateActivity (options: APProcessorOptions<ActivityUpdate>) {
+async function processUpdateActivity (options: APProcessorOptions<ActivityUpdate<ActivityUpdateObject>>) {
   const { activity, byActor } = options
 
-  const objectType = activity.object.type
+  const object = await fetchAPObject(activity.object)
+  const objectType = object.type
 
   if (objectType === 'Video') {
     return retryTransactionWrapper(processUpdateVideo, activity)
@@ -28,17 +30,17 @@ async function processUpdateActivity (options: APProcessorOptions<ActivityUpdate
   if (objectType === 'Person' || objectType === 'Application' || objectType === 'Group') {
     // We need more attributes
     const byActorFull = await ActorModel.loadByUrlAndPopulateAccountAndChannel(byActor.url)
-    return retryTransactionWrapper(processUpdateActor, byActorFull, activity)
+    return retryTransactionWrapper(processUpdateActor, byActorFull, object)
   }
 
   if (objectType === 'CacheFile') {
     // We need more attributes
     const byActorFull = await ActorModel.loadByUrlAndPopulateAccountAndChannel(byActor.url)
-    return retryTransactionWrapper(processUpdateCacheFile, byActorFull, activity)
+    return retryTransactionWrapper(processUpdateCacheFile, byActorFull, activity, object)
   }
 
   if (objectType === 'Playlist') {
-    return retryTransactionWrapper(processUpdatePlaylist, byActor, activity)
+    return retryTransactionWrapper(processUpdatePlaylist, byActor, activity, object)
   }
 
   return undefined
@@ -52,7 +54,7 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function processUpdateVideo (activity: ActivityUpdate) {
+async function processUpdateVideo (activity: ActivityUpdate<VideoObject | string>) {
   const videoObject = activity.object as VideoObject
 
   if (sanitizeAndCheckVideoTorrentObject(videoObject) === false) {
@@ -72,11 +74,13 @@ async function processUpdateVideo (activity: ActivityUpdate) {
   return updater.update(activity.to)
 }
 
-async function processUpdateCacheFile (byActor: MActorSignature, activity: ActivityUpdate) {
+async function processUpdateCacheFile (
+  byActor: MActorSignature,
+  activity: ActivityUpdate<CacheFileObject | string>,
+  cacheFileObject: CacheFileObject
+) {
   if (await isRedundancyAccepted(activity, byActor) !== true) return
 
-  const cacheFileObject = activity.object as CacheFileObject
-
   if (!isCacheFileObjectValid(cacheFileObject)) {
     logger.debug('Cache file object sent by update is not valid.', { cacheFileObject })
     return undefined
@@ -96,19 +100,19 @@ async function processUpdateCacheFile (byActor: MActorSignature, activity: Activ
   }
 }
 
-async function processUpdateActor (actor: MActorFull, activity: ActivityUpdate) {
-  const actorObject = activity.object as ActivityPubActor
-
+async function processUpdateActor (actor: MActorFull, actorObject: ActivityPubActor) {
   logger.debug('Updating remote account "%s".', actorObject.url)
 
   const updater = new APActorUpdater(actorObject, actor)
   return updater.update()
 }
 
-async function processUpdatePlaylist (byActor: MActorSignature, activity: ActivityUpdate) {
-  const playlistObject = activity.object as PlaylistObject
+async function processUpdatePlaylist (
+  byActor: MActorSignature,
+  activity: ActivityUpdate<PlaylistObject | string>,
+  playlistObject: PlaylistObject
+) {
   const byAccount = byActor.Account
-
   if (!byAccount) throw new Error('Cannot update video playlist with the non account actor ' + byActor.url)
 
   await createOrUpdateVideoPlaylist(playlistObject, activity.to)