X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fusers.ts;h=b4d5751e70281d0ba6f7941fbb6bbda564bb5744;hb=0bc1b31d60ed0edf3999f51743b653068ef1816e;hp=e3ad9102ad030911f6ef5551f5081dce9d1aeeed;hpb=1eddc9a74f9a80fa5d0cb25fceb3fc47a1a3c14a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts index e3ad9102a..b4d5751e7 100644 --- a/server/helpers/custom-validators/users.ts +++ b/server/helpers/custom-validators/users.ts @@ -1,10 +1,8 @@ -import 'express-validator' -import * as validator from 'validator' -import { UserNotificationSettingValue, UserRole } from '../../../shared' +import validator from 'validator' +import { UserRole } from '../../../shared' import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants' -import { exists, isFileValid, isBooleanValid } from './misc' +import { exists, isArray, isBooleanValid, isFileValid } from './misc' import { values } from 'lodash' -import { UserAdminFlag } from '../../../shared/models/users/user-flag.model' const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS @@ -55,6 +53,10 @@ function isUserAutoPlayVideoValid (value: any) { return isBooleanValid(value) } +function isUserVideoLanguages (value: any) { + return value === null || (isArray(value) && value.length < CONSTRAINTS_FIELDS.USERS.VIDEO_LANGUAGES.max) +} + function isUserAdminFlagsValid (value: any) { return exists(value) && validator.isInt('' + value) } @@ -63,6 +65,22 @@ function isUserBlockedValid (value: any) { return isBooleanValid(value) } +function isUserAutoPlayNextVideoValid (value: any) { + return isBooleanValid(value) +} + +function isUserAutoPlayNextVideoPlaylistValid (value: any) { + return isBooleanValid(value) +} + +function isNoInstanceConfigWarningModal (value: any) { + return isBooleanValid(value) +} + +function isNoWelcomeModal (value: any) { + return isBooleanValid(value) +} + function isUserBlockedReasonValid (value: any) { return value === null || (exists(value) && validator.isLength(value, CONSTRAINTS_FIELDS.USERS.BLOCKED_REASON)) } @@ -85,6 +103,7 @@ export { isUserVideosHistoryEnabledValid, isUserBlockedValid, isUserPasswordValid, + isUserVideoLanguages, isUserBlockedReasonValid, isUserRoleValid, isUserVideoQuotaValid, @@ -95,7 +114,11 @@ export { isUserNSFWPolicyValid, isUserWebTorrentEnabledValid, isUserAutoPlayVideoValid, + isUserAutoPlayNextVideoValid, + isUserAutoPlayNextVideoPlaylistValid, isUserDisplayNameValid, isUserDescriptionValid, + isNoInstanceConfigWarningModal, + isNoWelcomeModal, isAvatarFile }