From 863477173efa82a4412d2e522aa46462249f9199 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 17 Aug 2022 15:44:32 +0200 Subject: Cleanup tests imports --- server/middlewares/validators/blocklist.ts | 6 +++--- server/middlewares/validators/logs.ts | 5 +++-- server/middlewares/validators/user-subscriptions.ts | 4 ++-- server/middlewares/validators/videos/videos.ts | 15 +++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/blocklist.ts b/server/middlewares/validators/blocklist.ts index 1bae3764a..8ec6cb01d 100644 --- a/server/middlewares/validators/blocklist.ts +++ b/server/middlewares/validators/blocklist.ts @@ -1,8 +1,8 @@ import express from 'express' import { body, param, query } from 'express-validator' import { areValidActorHandles } from '@server/helpers/custom-validators/activitypub/actor' -import { toArray } from '@server/helpers/custom-validators/misc' import { getServerActor } from '@server/models/application/application' +import { arrayify } from '@shared/core-utils' import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers' import { WEBSERVER } from '../../initializers/constants' @@ -121,12 +121,12 @@ const unblockServerByServerValidator = [ const blocklistStatusValidator = [ query('hosts') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(isEachUniqueHostValid).withMessage('Should have a valid hosts array'), query('accounts') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(areValidActorHandles).withMessage('Should have a valid accounts array'), (req: express.Request, res: express.Response, next: express.NextFunction) => { diff --git a/server/middlewares/validators/logs.ts b/server/middlewares/validators/logs.ts index 584cb2aaf..2d828bb42 100644 --- a/server/middlewares/validators/logs.ts +++ b/server/middlewares/validators/logs.ts @@ -3,6 +3,7 @@ import { body, query } from 'express-validator' import { isUrlValid } from '@server/helpers/custom-validators/activitypub/misc' import { isStringArray } from '@server/helpers/custom-validators/search' import { CONFIG } from '@server/initializers/config' +import { arrayify } from '@shared/core-utils' import { HttpStatusCode } from '@shared/models' import { isValidClientLogLevel, @@ -12,7 +13,7 @@ import { isValidClientLogUserAgent, isValidLogLevel } from '../../helpers/custom-validators/logs' -import { isDateValid, toArray } from '../../helpers/custom-validators/misc' +import { isDateValid } from '../../helpers/custom-validators/misc' import { areValidationErrors } from './shared' const createClientLogValidator = [ @@ -56,7 +57,7 @@ const getLogsValidator = [ .custom(isValidLogLevel), query('tagsOneOf') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(isStringArray).withMessage('Should have a valid one of tags array'), query('endDate') .optional() diff --git a/server/middlewares/validators/user-subscriptions.ts b/server/middlewares/validators/user-subscriptions.ts index a76628915..d01043c17 100644 --- a/server/middlewares/validators/user-subscriptions.ts +++ b/server/middlewares/validators/user-subscriptions.ts @@ -1,8 +1,8 @@ +import { arrayify } from '@shared/core-utils' import express from 'express' import { body, param, query } from 'express-validator' import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' import { areValidActorHandles, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor' -import { toArray } from '../../helpers/custom-validators/misc' import { WEBSERVER } from '../../initializers/constants' import { ActorFollowModel } from '../../models/actor/actor-follow' import { areValidationErrors } from './shared' @@ -32,7 +32,7 @@ const userSubscriptionAddValidator = [ const areSubscriptionsExistValidator = [ query('uris') - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(areValidActorHandles).withMessage('Should have a valid array of URIs'), (req: express.Request, res: express.Response, next: express.NextFunction) => { diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts index 3d93bc62f..7fd2b03d1 100644 --- a/server/middlewares/validators/videos/videos.ts +++ b/server/middlewares/validators/videos/videos.ts @@ -6,7 +6,7 @@ import { Redis } from '@server/lib/redis' import { getServerActor } from '@server/models/application/application' import { ExpressPromiseHandler } from '@server/types/express-handler' import { MUserAccountId, MVideoFullLight } from '@server/types/models' -import { getAllPrivacies } from '@shared/core-utils' +import { arrayify, getAllPrivacies } from '@shared/core-utils' import { HttpStatusCode, ServerErrorCode, UserRight, VideoInclude } from '@shared/models' import { exists, @@ -14,7 +14,6 @@ import { isDateValid, isFileValid, isIdValid, - toArray, toBooleanOrNull, toIntOrNull, toValueOrNull @@ -419,27 +418,27 @@ function getCommonVideoEditAttributes () { const commonVideosFiltersValidator = [ query('categoryOneOf') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(isNumberArray).withMessage('Should have a valid categoryOneOf array'), query('licenceOneOf') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(isNumberArray).withMessage('Should have a valid licenceOneOf array'), query('languageOneOf') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(isStringArray).withMessage('Should have a valid languageOneOf array'), query('privacyOneOf') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(isNumberArray).withMessage('Should have a valid privacyOneOf array'), query('tagsOneOf') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(isStringArray).withMessage('Should have a valid tagsOneOf array'), query('tagsAllOf') .optional() - .customSanitizer(toArray) + .customSanitizer(arrayify) .custom(isStringArray).withMessage('Should have a valid tagsAllOf array'), query('nsfw') .optional() -- cgit v1.2.3