From 0883b3245bf0deb9106c4041e9afbd3521b79280 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 19 Apr 2018 11:01:34 +0200 Subject: Add ability to choose what policy we have for NSFW videos There is a global instance setting and a per user setting --- server/helpers/custom-validators/users.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'server/helpers/custom-validators') diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts index bbc7cc199..c0acb8218 100644 --- a/server/helpers/custom-validators/users.ts +++ b/server/helpers/custom-validators/users.ts @@ -1,9 +1,10 @@ import 'express-validator' import * as validator from 'validator' import { UserRole } from '../../../shared' -import { CONSTRAINTS_FIELDS } from '../../initializers' +import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers' import { exists, isFileValid } from './misc' +import { values } from 'lodash' const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS @@ -29,8 +30,9 @@ function isBoolean (value: any) { return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value)) } -function isUserDisplayNSFWValid (value: any) { - return isBoolean(value) +const nsfwPolicies = values(NSFW_POLICY_TYPES) +function isUserNSFWPolicyValid (value: any) { + return exists(value) && nsfwPolicies.indexOf(value) !== -1 } function isUserAutoPlayVideoValid (value: any) { @@ -56,7 +58,7 @@ export { isUserRoleValid, isUserVideoQuotaValid, isUserUsernameValid, - isUserDisplayNSFWValid, + isUserNSFWPolicyValid, isUserAutoPlayVideoValid, isUserDescriptionValid, isAvatarFile -- cgit v1.2.3