From 67f87b66fe99a5982580b1f555245abde1c03380 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 5 Mar 2021 13:49:58 +0100 Subject: Refactor a little bit AP validators --- server/lib/job-queue/handlers/activitypub-cleaner.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 b58bbc983..0e75b0a6e 100644 --- a/server/lib/job-queue/handlers/activitypub-cleaner.ts +++ b/server/lib/job-queue/handlers/activitypub-cleaner.ts @@ -1,8 +1,11 @@ import * as Bluebird from 'bluebird' import * as Bull from 'bull' import { checkUrlsSameHost } from '@server/helpers/activitypub' -import { isDislikeActivityValid, isLikeActivityValid } from '@server/helpers/custom-validators/activitypub/rate' -import { isShareActivityValid } from '@server/helpers/custom-validators/activitypub/share' +import { + isAnnounceActivityValid, + isDislikeActivityValid, + 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 { AP_CLEANER_CONCURRENCY } from '@server/initializers/constants' @@ -149,7 +152,7 @@ function rateOptionsFactory () { function shareOptionsFactory () { return { - bodyValidator: (body: any) => isShareActivityValid(body), + bodyValidator: (body: any) => isAnnounceActivityValid(body), updater: async (url: string, newUrl: string) => { const share = await VideoShareModel.loadByUrl(url, undefined) -- cgit v1.2.3