2 files changed, 86 insertions, 39 deletions

diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index b6ba2cc22..0882ab843 100644
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -7,10 +7,11 @@ import { ActivityPubActor, ActivityPubActorType } from '../../../shared/models/a
 import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects'
 import { isActorObjectValid } from '../../helpers/custom-validators/activitypub/actor'
 import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
-import { retryTransactionWrapper } from '../../helpers/database-utils'
+import { retryTransactionWrapper, updateInstanceWithAnother } from '../../helpers/database-utils'
 import { logger } from '../../helpers/logger'
 import { createPrivateAndPublicKeys } from '../../helpers/peertube-crypto'
 import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
+import { getUrlFromWebfinger } from '../../helpers/webfinger'
 import { AVATAR_MIMETYPE_EXT, CONFIG, sequelizeTypescript } from '../../initializers'
 import { AccountModel } from '../../models/account/account'
 import { ActorModel } from '../../models/activitypub/actor'
@@ -63,7 +64,7 @@ async function getOrCreateActorAndServerAndModel (actorUrl: string, recurseIfNee
     actor = await retryTransactionWrapper(saveActorAndServerAndModelIfNotExist, options)
   }
 
-  return actor
+  return refreshActorIfNeeded(actor)
 }
 
 function buildActorInstance (type: ActivityPubActorType, url: string, preferredUsername: string, uuid?: string) {
@@ -84,6 +85,45 @@ function buildActorInstance (type: ActivityPubActorType, url: string, preferredU
   })
 }
 
+async function updateActorInstance (actorInstance: ActorModel, attributes: ActivityPubActor) {
+  const followersCount = await fetchActorTotalItems(attributes.followers)
+  const followingCount = await fetchActorTotalItems(attributes.following)
+
+  actorInstance.set('type', attributes.type)
+  actorInstance.set('uuid', attributes.uuid)
+  actorInstance.set('preferredUsername', attributes.preferredUsername)
+  actorInstance.set('url', attributes.id)
+  actorInstance.set('publicKey', attributes.publicKey.publicKeyPem)
+  actorInstance.set('followersCount', followersCount)
+  actorInstance.set('followingCount', followingCount)
+  actorInstance.set('inboxUrl', attributes.inbox)
+  actorInstance.set('outboxUrl', attributes.outbox)
+  actorInstance.set('sharedInboxUrl', attributes.endpoints.sharedInbox)
+  actorInstance.set('followersUrl', attributes.followers)
+  actorInstance.set('followingUrl', attributes.following)
+}
+
+async function updateActorAvatarInstance (actorInstance: ActorModel, avatarName: string, t: Transaction) {
+  if (avatarName !== undefined) {
+    if (actorInstance.avatarId) {
+      try {
+        await actorInstance.Avatar.destroy({ transaction: t })
+      } catch (err) {
+        logger.error('Cannot remove old avatar of actor %s.', actorInstance.url, err)
+      }
+    }
+
+    const avatar = await AvatarModel.create({
+      filename: avatarName
+    }, { transaction: t })
+
+    actorInstance.set('avatarId', avatar.id)
+    actorInstance.Avatar = avatar
+  }
+
+  return actorInstance
+}
+
 async function fetchActorTotalItems (url: string) {
   const options = {
     uri: url,
@@ -129,7 +169,9 @@ export {
   buildActorInstance,
   setAsyncActorKeys,
   fetchActorTotalItems,
-  fetchAvatarIfExists
+  fetchAvatarIfExists,
+  updateActorInstance,
+  updateActorAvatarInstance
 }
 
 // ---------------------------------------------------------------------------
@@ -263,3 +305,35 @@ async function saveVideoChannel (actor: ActorModel, result: FetchRemoteActorResu
 
   return videoChannel.save({ transaction: t })
 }
+
+async function refreshActorIfNeeded (actor: ActorModel) {
+  if (!actor.isOutdated()) return actor
+
+  const actorUrl = await getUrlFromWebfinger(actor.preferredUsername, actor.getHost())
+  const result = await fetchRemoteActor(actorUrl)
+  if (result === undefined) throw new Error('Cannot fetch remote actor in refresh actor.')
+
+  return sequelizeTypescript.transaction(async t => {
+    updateInstanceWithAnother(actor, result.actor)
+
+    if (result.avatarName !== undefined) {
+      await updateActorAvatarInstance(actor, result.avatarName, t)
+    }
+
+    await actor.save({ transaction: t })
+
+    if (actor.Account) {
+      await actor.save({ transaction: t })
+
+      actor.Account.set('name', result.name)
+      await actor.Account.save({ transaction: t })
+    } else if (actor.VideoChannel) {
+      await actor.save({ transaction: t })
+
+      actor.VideoChannel.set('name', result.name)
+      await actor.VideoChannel.save({ transaction: t })
+    }
+
+    return actor
+  })
+}
diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index 05ea7d272..2c094f7ca 100644
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -8,11 +8,10 @@ import { resetSequelizeInstance } from '../../../helpers/utils'
 import { sequelizeTypescript } from '../../../initializers'
 import { AccountModel } from '../../../models/account/account'
 import { ActorModel } from '../../../models/activitypub/actor'
-import { AvatarModel } from '../../../models/avatar/avatar'
 import { TagModel } from '../../../models/video/tag'
 import { VideoModel } from '../../../models/video/video'
 import { VideoFileModel } from '../../../models/video/video-file'
-import { fetchActorTotalItems, fetchAvatarIfExists, getOrCreateActorAndServerAndModel } from '../actor'
+import { fetchAvatarIfExists, getOrCreateActorAndServerAndModel, updateActorAvatarInstance, updateActorInstance } from '../actor'
 import { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes } from './misc'
 
 async function processUpdateActivity (activity: ActivityUpdate) {
@@ -124,7 +123,6 @@ async function updateRemoteAccount (actor: ActorModel, activity: ActivityUpdate)
   const accountAttributesToUpdate = activity.object as ActivityPubActor
 
   logger.debug('Updating remote account "%s".', accountAttributesToUpdate.uuid)
-  let actorInstance: ActorModel
   let accountInstance: AccountModel
   let actorFieldsSave: object
   let accountFieldsSave: object
@@ -134,39 +132,14 @@ async function updateRemoteAccount (actor: ActorModel, activity: ActivityUpdate)
 
   try {
     await sequelizeTypescript.transaction(async t => {
-      actorInstance = await ActorModel.loadByUrl(accountAttributesToUpdate.id, t)
-      if (!actorInstance) throw new Error('Actor ' + accountAttributesToUpdate.id + ' not found.')
-
-      actorFieldsSave = actorInstance.toJSON()
-      accountInstance = actorInstance.Account
-      accountFieldsSave = actorInstance.Account.toJSON()
-
-      const followersCount = await fetchActorTotalItems(accountAttributesToUpdate.followers)
-      const followingCount = await fetchActorTotalItems(accountAttributesToUpdate.following)
-
-      actorInstance.set('type', accountAttributesToUpdate.type)
-      actorInstance.set('uuid', accountAttributesToUpdate.uuid)
-      actorInstance.set('preferredUsername', accountAttributesToUpdate.preferredUsername)
-      actorInstance.set('url', accountAttributesToUpdate.id)
-      actorInstance.set('publicKey', accountAttributesToUpdate.publicKey.publicKeyPem)
-      actorInstance.set('followersCount', followersCount)
-      actorInstance.set('followingCount', followingCount)
-      actorInstance.set('inboxUrl', accountAttributesToUpdate.inbox)
-      actorInstance.set('outboxUrl', accountAttributesToUpdate.outbox)
-      actorInstance.set('sharedInboxUrl', accountAttributesToUpdate.endpoints.sharedInbox)
-      actorInstance.set('followersUrl', accountAttributesToUpdate.followers)
-      actorInstance.set('followingUrl', accountAttributesToUpdate.following)
+      actorFieldsSave = actor.toJSON()
+      accountInstance = actor.Account
+      accountFieldsSave = actor.Account.toJSON()
 
-      if (avatarName !== undefined) {
-        if (actorInstance.avatarId) {
-          await actorInstance.Avatar.destroy({ transaction: t })
-        }
-
-        const avatar = await AvatarModel.create({
-          filename: avatarName
-        }, { transaction: t })
+      await updateActorInstance(actor, accountAttributesToUpdate)
 
-        actor.set('avatarId', avatar.id)
+      if (avatarName !== undefined) {
+        await updateActorAvatarInstance(actor, avatarName, t)
       }
 
       await actor.save({ transaction: t })
@@ -177,8 +150,8 @@ async function updateRemoteAccount (actor: ActorModel, activity: ActivityUpdate)
 
     logger.info('Remote account with uuid %s updated', accountAttributesToUpdate.uuid)
   } catch (err) {
-    if (actorInstance !== undefined && actorFieldsSave !== undefined) {
-      resetSequelizeInstance(actorInstance, actorFieldsSave)
+    if (actor !== undefined && actorFieldsSave !== undefined) {
+      resetSequelizeInstance(actor, actorFieldsSave)
     }
 
     if (accountInstance !== undefined && accountFieldsSave !== undefined) {