From db4b15f21fbf4e33434e930ffc7fb768cdcf9d42 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 8 Mar 2021 14:24:11 +0100 Subject: Use got instead of request --- server/lib/job-queue/handlers/activitypub-cleaner.ts | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'server/lib/job-queue/handlers/activitypub-cleaner.ts') diff --git a/server/lib/job-queue/handlers/activitypub-cleaner.ts b/server/lib/job-queue/handlers/activitypub-cleaner.ts index 0e75b0a6e..9dcc778fa 100644 --- a/server/lib/job-queue/handlers/activitypub-cleaner.ts +++ b/server/lib/job-queue/handlers/activitypub-cleaner.ts @@ -7,7 +7,7 @@ import { isLikeActivityValid } from '@server/helpers/custom-validators/activitypub/activity' import { sanitizeAndCheckVideoCommentObject } from '@server/helpers/custom-validators/activitypub/video-comments' -import { doRequest } from '@server/helpers/requests' +import { doJSONRequest } from '@server/helpers/requests' import { AP_CLEANER_CONCURRENCY } from '@server/initializers/constants' import { VideoModel } from '@server/models/video/video' import { VideoCommentModel } from '@server/models/video/video-comment' @@ -81,15 +81,10 @@ async function updateObjectIfNeeded ( updater: (url: string, newUrl: string) => Promise, deleter: (url: string) => Promise ): Promise<{ data: T, status: 'deleted' | 'updated' } | null> { - // Fetch url - const { response, body } = await doRequest({ - uri: url, - json: true, - activityPub: true - }) + const { statusCode, body } = await doJSONRequest(url, { activityPub: true }) // Does not exist anymore, remove entry - if (response.statusCode === HttpStatusCode.NOT_FOUND_404) { + if (statusCode === HttpStatusCode.NOT_FOUND_404) { logger.info('Removing remote AP object %s.', url) const data = await deleter(url) -- cgit v1.2.3