diff options
author | Florian CUNY <poslovitch@bentobox.world> | 2021-10-26 16:42:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-26 16:42:10 +0200 |
commit | 754b6f5f41bdc40aaaeefdb3c351666c305abe20 (patch) | |
tree | d36c8081f3137f1e2c9763879f71d41aa9a3efc1 /server/initializers | |
parent | 615836dbd4f48fc563551446529fa9d3b14dc329 (diff) | |
download | PeerTube-754b6f5f41bdc40aaaeefdb3c351666c305abe20.tar.gz PeerTube-754b6f5f41bdc40aaaeefdb3c351666c305abe20.tar.zst PeerTube-754b6f5f41bdc40aaaeefdb3c351666c305abe20.zip |
Made the video channels limit (per user) server-wide configurable (#4491)
* Made the video channels limit (per user) server-wide configurable
Implements https://github.com/Chocobozzz/PeerTube/issues/3092
Also added a "quota bar" in the account's settings page
* Fixed lint errors
* Another pass at fixing lint errors
* Applied code suggestions
* Removed 'video channels quota'
Diffstat (limited to 'server/initializers')
-rw-r--r-- | server/initializers/checker-before-init.ts | 1 | ||||
-rw-r--r-- | server/initializers/config.ts | 3 | ||||
-rw-r--r-- | server/initializers/constants.ts | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 16dc137c0..72acdd422 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts | |||
@@ -19,6 +19,7 @@ function checkMissedConfig () { | |||
19 | 'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', 'storage.plugins', | 19 | 'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', 'storage.plugins', |
20 | 'log.level', | 20 | 'log.level', |
21 | 'user.video_quota', 'user.video_quota_daily', | 21 | 'user.video_quota', 'user.video_quota_daily', |
22 | 'video_channels.max_per_user', | ||
22 | 'csp.enabled', 'csp.report_only', 'csp.report_uri', | 23 | 'csp.enabled', 'csp.report_only', 'csp.report_uri', |
23 | 'security.frameguard.enabled', | 24 | 'security.frameguard.enabled', |
24 | 'cache.previews.size', 'cache.captions.size', 'cache.torrents.size', 'admin.email', 'contact_form.enabled', | 25 | 'cache.previews.size', 'cache.captions.size', 'cache.torrents.size', 'admin.email', 'contact_form.enabled', |
diff --git a/server/initializers/config.ts b/server/initializers/config.ts index cab60a61f..8375bf430 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts | |||
@@ -233,6 +233,9 @@ const CONFIG = { | |||
233 | get VIDEO_QUOTA () { return parseBytes(config.get<number>('user.video_quota')) }, | 233 | get VIDEO_QUOTA () { return parseBytes(config.get<number>('user.video_quota')) }, |
234 | get VIDEO_QUOTA_DAILY () { return parseBytes(config.get<number>('user.video_quota_daily')) } | 234 | get VIDEO_QUOTA_DAILY () { return parseBytes(config.get<number>('user.video_quota_daily')) } |
235 | }, | 235 | }, |
236 | VIDEO_CHANNELS: { | ||
237 | get MAX_PER_USER () { return config.get<number>('video_channels.max_per_user') } | ||
238 | }, | ||
236 | TRANSCODING: { | 239 | TRANSCODING: { |
237 | get ENABLED () { return config.get<boolean>('transcoding.enabled') }, | 240 | get ENABLED () { return config.get<boolean>('transcoding.enabled') }, |
238 | get ALLOW_ADDITIONAL_EXTENSIONS () { return config.get<boolean>('transcoding.allow_additional_extensions') }, | 241 | get ALLOW_ADDITIONAL_EXTENSIONS () { return config.get<boolean>('transcoding.allow_additional_extensions') }, |
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index f6c19dab4..3781f9508 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -512,10 +512,6 @@ const OVERVIEWS = { | |||
512 | } | 512 | } |
513 | } | 513 | } |
514 | 514 | ||
515 | const VIDEO_CHANNELS = { | ||
516 | MAX_PER_USER: 20 | ||
517 | } | ||
518 | |||
519 | // --------------------------------------------------------------------------- | 515 | // --------------------------------------------------------------------------- |
520 | 516 | ||
521 | const SERVER_ACTOR_NAME = 'peertube' | 517 | const SERVER_ACTOR_NAME = 'peertube' |
@@ -897,7 +893,6 @@ export { | |||
897 | VIDEO_TRANSCODING_FPS, | 893 | VIDEO_TRANSCODING_FPS, |
898 | FFMPEG_NICE, | 894 | FFMPEG_NICE, |
899 | ABUSE_STATES, | 895 | ABUSE_STATES, |
900 | VIDEO_CHANNELS, | ||
901 | LRU_CACHE, | 896 | LRU_CACHE, |
902 | REQUEST_TIMEOUT, | 897 | REQUEST_TIMEOUT, |
903 | USER_PASSWORD_RESET_LIFETIME, | 898 | USER_PASSWORD_RESET_LIFETIME, |