From: Chocobozzz <me@florianbigard.com>
Date: Wed, 24 Jan 2018 15:15:27 +0000 (+0100)
Subject: Accept actors with url objects instead of string
X-Git-Tag: v0.0.16-alpha~20
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=d765fafc3faf0db9818eb1a07161df1cb1bc0efa;p=github%2FChocobozzz%2FPeerTube.git

Accept actors with url objects instead of string
---

diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index 7494aadbb..c708b38ba 100644
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -252,7 +252,7 @@ async function fetchRemoteActor (actorUrl: string): Promise<FetchRemoteActorResu
   logger.info('Fetching remote actor %s.', actorUrl)
 
   const requestResult = await doRequest(options)
-  const actorJSON: ActivityPubActor = requestResult.body
+  const actorJSON: ActivityPubActor = normalizeActor(requestResult.body)
 
   if (isActorObjectValid(actorJSON) === false) {
     logger.debug('Remote actor JSON is not valid.', { actorJSON: actorJSON })
@@ -358,3 +358,10 @@ async function refreshActorIfNeeded (actor: ActorModel) {
     return actor
   })
 }
+
+function normalizeActor (actor: any) {
+  if (actor && actor.url && typeof actor.url === 'string') return actor
+
+  actor.url = actor.url.href || actor.url.url
+  return actor
+}