1 files changed, 92 insertions, 94 deletions

diff --git a/server/middlewares/validators/config.ts b/server/middlewares/validators/config.ts
index f60103f48..c89f3087e 100644
--- a/server/middlewares/validators/config.ts
+++ b/server/middlewares/validators/config.ts
@@ -11,100 +11,98 @@ import { areValidationErrors } from './shared'
 import { HttpStatusCode } from '@shared/models/http/http-error-codes'
 
 const customConfigUpdateValidator = [
-  body('instance.name').exists().withMessage('Should have a valid instance name'),
-  body('instance.shortDescription').exists().withMessage('Should have a valid instance short description'),
-  body('instance.description').exists().withMessage('Should have a valid instance description'),
-  body('instance.terms').exists().withMessage('Should have a valid instance terms'),
-  body('instance.defaultNSFWPolicy').custom(isUserNSFWPolicyValid).withMessage('Should have a valid NSFW policy'),
-  body('instance.defaultClientRoute').exists().withMessage('Should have a valid instance default client route'),
-  body('instance.customizations.css').exists().withMessage('Should have a valid instance CSS customization'),
-  body('instance.customizations.javascript').exists().withMessage('Should have a valid instance JavaScript customization'),
-
-  body('services.twitter.username').exists().withMessage('Should have a valid twitter username'),
-  body('services.twitter.whitelisted').isBoolean().withMessage('Should have a valid twitter whitelisted boolean'),
-
-  body('cache.previews.size').isInt().withMessage('Should have a valid previews cache size'),
-  body('cache.captions.size').isInt().withMessage('Should have a valid captions cache size'),
-  body('cache.torrents.size').isInt().withMessage('Should have a valid torrents cache size'),
-
-  body('signup.enabled').isBoolean().withMessage('Should have a valid signup enabled boolean'),
-  body('signup.limit').isInt().withMessage('Should have a valid signup limit'),
-  body('signup.requiresEmailVerification').isBoolean().withMessage('Should have a valid requiresEmailVerification boolean'),
-  body('signup.minimumAge').isInt().withMessage('Should have a valid minimum age required'),
-
-  body('admin.email').isEmail().withMessage('Should have a valid administrator email'),
-  body('contactForm.enabled').isBoolean().withMessage('Should have a valid contact form enabled boolean'),
-
-  body('user.videoQuota').custom(isUserVideoQuotaValid).withMessage('Should have a valid video quota'),
-  body('user.videoQuotaDaily').custom(isUserVideoQuotaDailyValid).withMessage('Should have a valid daily video quota'),
-
-  body('videoChannels.maxPerUser').isInt().withMessage('Should have a valid maximum amount of video channels per user'),
-
-  body('transcoding.enabled').isBoolean().withMessage('Should have a valid transcoding enabled boolean'),
-  body('transcoding.allowAdditionalExtensions').isBoolean().withMessage('Should have a valid additional extensions boolean'),
-  body('transcoding.threads').isInt().withMessage('Should have a valid transcoding threads number'),
-  body('transcoding.concurrency').isInt({ min: 1 }).withMessage('Should have a valid transcoding concurrency number'),
-  body('transcoding.resolutions.0p').isBoolean().withMessage('Should have a valid transcoding 0p resolution enabled boolean'),
-  body('transcoding.resolutions.144p').isBoolean().withMessage('Should have a valid transcoding 144p resolution enabled boolean'),
-  body('transcoding.resolutions.240p').isBoolean().withMessage('Should have a valid transcoding 240p resolution enabled boolean'),
-  body('transcoding.resolutions.360p').isBoolean().withMessage('Should have a valid transcoding 360p resolution enabled boolean'),
-  body('transcoding.resolutions.480p').isBoolean().withMessage('Should have a valid transcoding 480p resolution enabled boolean'),
-  body('transcoding.resolutions.720p').isBoolean().withMessage('Should have a valid transcoding 720p resolution enabled boolean'),
-  body('transcoding.resolutions.1080p').isBoolean().withMessage('Should have a valid transcoding 1080p resolution enabled boolean'),
-  body('transcoding.resolutions.1440p').isBoolean().withMessage('Should have a valid transcoding 1440p resolution enabled boolean'),
-  body('transcoding.resolutions.2160p').isBoolean().withMessage('Should have a valid transcoding 2160p resolution enabled boolean'),
-
-  body('transcoding.alwaysTranscodeOriginalResolution').isBoolean()
-    .withMessage('Should have a valid always transcode original resolution boolean'),
-
-  body('transcoding.webtorrent.enabled').isBoolean().withMessage('Should have a valid webtorrent transcoding enabled boolean'),
-  body('transcoding.hls.enabled').isBoolean().withMessage('Should have a valid hls transcoding enabled boolean'),
-
-  body('videoStudio.enabled').isBoolean().withMessage('Should have a valid video studio enabled boolean'),
-
-  body('import.videos.concurrency').isInt({ min: 0 }).withMessage('Should have a valid import concurrency number'),
-  body('import.videos.http.enabled').isBoolean().withMessage('Should have a valid import video http enabled boolean'),
-  body('import.videos.torrent.enabled').isBoolean().withMessage('Should have a valid import video torrent enabled boolean'),
-
-  body('import.videoChannelSynchronization.enabled').isBoolean().withMessage('Should have a valid synchronization enabled boolean'),
-
-  body('trending.videos.algorithms.default').exists().withMessage('Should have a valid default trending algorithm'),
-  body('trending.videos.algorithms.enabled').exists().withMessage('Should have a valid array of enabled trending algorithms'),
-
-  body('followers.instance.enabled').isBoolean().withMessage('Should have a valid followers of instance boolean'),
-  body('followers.instance.manualApproval').isBoolean().withMessage('Should have a valid manual approval boolean'),
-
-  body('theme.default').custom(v => isThemeNameValid(v) && isThemeRegistered(v)).withMessage('Should have a valid theme'),
-
-  body('broadcastMessage.enabled').isBoolean().withMessage('Should have a valid broadcast message enabled boolean'),
-  body('broadcastMessage.message').exists().withMessage('Should have a valid broadcast message'),
-  body('broadcastMessage.level').exists().withMessage('Should have a valid broadcast level'),
-  body('broadcastMessage.dismissable').isBoolean().withMessage('Should have a valid broadcast dismissable boolean'),
-
-  body('live.enabled').isBoolean().withMessage('Should have a valid live enabled boolean'),
-  body('live.allowReplay').isBoolean().withMessage('Should have a valid live allow replay boolean'),
-  body('live.maxDuration').isInt().withMessage('Should have a valid live max duration'),
-  body('live.maxInstanceLives').custom(isIntOrNull).withMessage('Should have a valid max instance lives'),
-  body('live.maxUserLives').custom(isIntOrNull).withMessage('Should have a valid max user lives'),
-  body('live.transcoding.enabled').isBoolean().withMessage('Should have a valid live transcoding enabled boolean'),
-  body('live.transcoding.threads').isInt().withMessage('Should have a valid live transcoding threads'),
-  body('live.transcoding.resolutions.144p').isBoolean().withMessage('Should have a valid transcoding 144p resolution enabled boolean'),
-  body('live.transcoding.resolutions.240p').isBoolean().withMessage('Should have a valid transcoding 240p resolution enabled boolean'),
-  body('live.transcoding.resolutions.360p').isBoolean().withMessage('Should have a valid transcoding 360p resolution enabled boolean'),
-  body('live.transcoding.resolutions.480p').isBoolean().withMessage('Should have a valid transcoding 480p resolution enabled boolean'),
-  body('live.transcoding.resolutions.720p').isBoolean().withMessage('Should have a valid transcoding 720p resolution enabled boolean'),
-  body('live.transcoding.resolutions.1080p').isBoolean().withMessage('Should have a valid transcoding 1080p resolution enabled boolean'),
-  body('live.transcoding.resolutions.1440p').isBoolean().withMessage('Should have a valid transcoding 1440p resolution enabled boolean'),
-  body('live.transcoding.resolutions.2160p').isBoolean().withMessage('Should have a valid transcoding 2160p resolution enabled boolean'),
-  body('live.transcoding.alwaysTranscodeOriginalResolution').isBoolean()
-    .withMessage('Should have a valid always transcode live original resolution boolean'),
-
-  body('search.remoteUri.users').isBoolean().withMessage('Should have a remote URI search for users boolean'),
-  body('search.remoteUri.anonymous').isBoolean().withMessage('Should have a valid remote URI search for anonymous boolean'),
-  body('search.searchIndex.enabled').isBoolean().withMessage('Should have a valid search index enabled boolean'),
-  body('search.searchIndex.url').exists().withMessage('Should have a valid search index URL'),
-  body('search.searchIndex.disableLocalSearch').isBoolean().withMessage('Should have a valid search index disable local search boolean'),
-  body('search.searchIndex.isDefaultSearch').isBoolean().withMessage('Should have a valid search index default enabled boolean'),
+  body('instance.name').exists(),
+  body('instance.shortDescription').exists(),
+  body('instance.description').exists(),
+  body('instance.terms').exists(),
+  body('instance.defaultNSFWPolicy').custom(isUserNSFWPolicyValid),
+  body('instance.defaultClientRoute').exists(),
+  body('instance.customizations.css').exists(),
+  body('instance.customizations.javascript').exists(),
+
+  body('services.twitter.username').exists(),
+  body('services.twitter.whitelisted').isBoolean(),
+
+  body('cache.previews.size').isInt(),
+  body('cache.captions.size').isInt(),
+  body('cache.torrents.size').isInt(),
+
+  body('signup.enabled').isBoolean(),
+  body('signup.limit').isInt(),
+  body('signup.requiresEmailVerification').isBoolean(),
+  body('signup.minimumAge').isInt(),
+
+  body('admin.email').isEmail(),
+  body('contactForm.enabled').isBoolean(),
+
+  body('user.videoQuota').custom(isUserVideoQuotaValid),
+  body('user.videoQuotaDaily').custom(isUserVideoQuotaDailyValid),
+
+  body('videoChannels.maxPerUser').isInt(),
+
+  body('transcoding.enabled').isBoolean(),
+  body('transcoding.allowAdditionalExtensions').isBoolean(),
+  body('transcoding.threads').isInt(),
+  body('transcoding.concurrency').isInt({ min: 1 }),
+  body('transcoding.resolutions.0p').isBoolean(),
+  body('transcoding.resolutions.144p').isBoolean(),
+  body('transcoding.resolutions.240p').isBoolean(),
+  body('transcoding.resolutions.360p').isBoolean(),
+  body('transcoding.resolutions.480p').isBoolean(),
+  body('transcoding.resolutions.720p').isBoolean(),
+  body('transcoding.resolutions.1080p').isBoolean(),
+  body('transcoding.resolutions.1440p').isBoolean(),
+  body('transcoding.resolutions.2160p').isBoolean(),
+
+  body('transcoding.alwaysTranscodeOriginalResolution').isBoolean(),
+
+  body('transcoding.webtorrent.enabled').isBoolean(),
+  body('transcoding.hls.enabled').isBoolean(),
+
+  body('videoStudio.enabled').isBoolean(),
+
+  body('import.videos.concurrency').isInt({ min: 0 }),
+  body('import.videos.http.enabled').isBoolean(),
+  body('import.videos.torrent.enabled').isBoolean(),
+
+  body('import.videoChannelSynchronization.enabled').isBoolean(),
+
+  body('trending.videos.algorithms.default').exists(),
+  body('trending.videos.algorithms.enabled').exists(),
+
+  body('followers.instance.enabled').isBoolean(),
+  body('followers.instance.manualApproval').isBoolean(),
+
+  body('theme.default').custom(v => isThemeNameValid(v) && isThemeRegistered(v)),
+
+  body('broadcastMessage.enabled').isBoolean(),
+  body('broadcastMessage.message').exists(),
+  body('broadcastMessage.level').exists(),
+  body('broadcastMessage.dismissable').isBoolean(),
+
+  body('live.enabled').isBoolean(),
+  body('live.allowReplay').isBoolean(),
+  body('live.maxDuration').isInt(),
+  body('live.maxInstanceLives').custom(isIntOrNull),
+  body('live.maxUserLives').custom(isIntOrNull),
+  body('live.transcoding.enabled').isBoolean(),
+  body('live.transcoding.threads').isInt(),
+  body('live.transcoding.resolutions.144p').isBoolean(),
+  body('live.transcoding.resolutions.240p').isBoolean(),
+  body('live.transcoding.resolutions.360p').isBoolean(),
+  body('live.transcoding.resolutions.480p').isBoolean(),
+  body('live.transcoding.resolutions.720p').isBoolean(),
+  body('live.transcoding.resolutions.1080p').isBoolean(),
+  body('live.transcoding.resolutions.1440p').isBoolean(),
+  body('live.transcoding.resolutions.2160p').isBoolean(),
+  body('live.transcoding.alwaysTranscodeOriginalResolution').isBoolean(),
+
+  body('search.remoteUri.users').isBoolean(),
+  body('search.remoteUri.anonymous').isBoolean(),
+  body('search.searchIndex.enabled').isBoolean(),
+  body('search.searchIndex.url').exists(),
+  body('search.searchIndex.disableLocalSearch').isBoolean(),
+  body('search.searchIndex.isDefaultSearch').isBoolean(),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking customConfigUpdateValidator parameters', { parameters: req.body })