-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 { parse } from 'url'
type HandlerFunction<T> = (items: T[]) => (Promise<any> | Bluebird<any>)
type CleanerFunction = (startedDate: Date) => (Promise<any> | Bluebird<any>)
let i = 0
let nextLink = firstBody.first
while (nextLink && i < limit) {
- options.uri = nextLink
+ let body: any
+
+ if (typeof nextLink === 'string') {
+ // Don't crawl ourselves
+ const remoteHost = parse(nextLink).host
+ if (remoteHost === WEBSERVER.HOST) continue
+
+ options.uri = nextLink
+
+ const res = await doRequest<ActivityPubOrderedCollection<T>>(options)
+ body = res.body
+ } else {
+ // nextLink is already the object we want
+ body = nextLink
+ }
- const { body } = await doRequest<ActivityPubOrderedCollection<T>>(options)
nextLink = body.next
i++