X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Factors%2Fshared%2Furl-to-object.ts;h=12a121725bba8fa5014e747f92fed16e11fa2c00;hb=ba2684ceddf9b76312635b9cddc6bf6975ce436a;hp=f4f16b04407655eb6833aa717130109977d3cbcd;hpb=136d7efde798d3dc0ec0dd18aac674365f7d162e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/actors/shared/url-to-object.ts b/server/lib/activitypub/actors/shared/url-to-object.ts
index f4f16b044..12a121725 100644
--- a/server/lib/activitypub/actors/shared/url-to-object.ts
+++ b/server/lib/activitypub/actors/shared/url-to-object.ts
@@ -1,9 +1,8 @@
-
-import { checkUrlsSameHost } from '@server/helpers/activitypub'
 import { sanitizeAndCheckActorObject } from '@server/helpers/custom-validators/activitypub/actor'
 import { logger } from '@server/helpers/logger'
 import { doJSONRequest } from '@server/helpers/requests'
 import { ActivityPubActor, ActivityPubOrderedCollection } from '@shared/models'
+import { checkUrlsSameHost } from '../../url'
 
 async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode: number, actorObject: ActivityPubActor }> {
   logger.info('Fetching remote actor %s.', actorUrl)
@@ -12,12 +11,12 @@ async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode: number
 
   if (sanitizeAndCheckActorObject(body) === false) {
     logger.debug('Remote actor JSON is not valid.', { actorJSON: body })
-    return { actorObject: undefined, statusCode: statusCode }
+    return { actorObject: undefined, statusCode }
   }
 
   if (checkUrlsSameHost(body.id, actorUrl) !== true) {
     logger.warn('Actor url %s has not the same host than its AP id %s', actorUrl, body.id)
-    return { actorObject: undefined, statusCode: statusCode }
+    return { actorObject: undefined, statusCode }
   }
 
   return {
@@ -48,7 +47,7 @@ async function fetchActorTotalItems (url: string) {
 
     return body.totalItems || 0
   } catch (err) {
-    logger.warn('Cannot fetch remote actor count %s.', url, { err })
+    logger.info('Cannot fetch remote actor count %s.', url, { err })
     return 0
   }
 }