From c0e71e849a40871ed8eea3dacd8608d380bdb490 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 25 Apr 2019 14:23:15 +0200 Subject: Fix user notifications tests --- server/lib/activitypub/crawl.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'server/lib/activitypub/crawl.ts') diff --git a/server/lib/activitypub/crawl.ts b/server/lib/activitypub/crawl.ts index ba5b67bee..0ba59b47d 100644 --- a/server/lib/activitypub/crawl.ts +++ b/server/lib/activitypub/crawl.ts @@ -1,8 +1,10 @@ -import { ACTIVITY_PUB, JOB_REQUEST_TIMEOUT } from '../../initializers/constants' +import { ACTIVITY_PUB, JOB_REQUEST_TIMEOUT, WEBSERVER } from '../../initializers/constants' import { doRequest } from '../../helpers/requests' import { logger } from '../../helpers/logger' import * as Bluebird from 'bluebird' import { ActivityPubOrderedCollection } from '../../../shared/models/activitypub' +import { checkUrlsSameHost } from '../../helpers/activitypub' +import { parse } from "url" type HandlerFunction = (items: T[]) => (Promise | Bluebird) type CleanerFunction = (startedDate: Date) => (Promise | Bluebird) @@ -27,6 +29,10 @@ async function crawlCollectionPage (uri: string, handler: HandlerFunction let i = 0 let nextLink = firstBody.first while (nextLink && i < limit) { + // Don't crawl ourselves + const remoteHost = parse(nextLink).host + if (remoteHost === WEBSERVER.HOST) continue + options.uri = nextLink const { body } = await doRequest>(options) -- cgit v1.2.3