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 /shared | |
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 'shared')
-rw-r--r-- | shared/extra-utils/server/config-command.ts | 3 | ||||
-rw-r--r-- | shared/models/server/custom-config.model.ts | 4 | ||||
-rw-r--r-- | shared/models/server/server-config.model.ts | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/shared/extra-utils/server/config-command.ts b/shared/extra-utils/server/config-command.ts index 51d04fa63..2746e9ac4 100644 --- a/shared/extra-utils/server/config-command.ts +++ b/shared/extra-utils/server/config-command.ts | |||
@@ -220,6 +220,9 @@ export class ConfigCommand extends AbstractCommand { | |||
220 | videoQuota: 5242881, | 220 | videoQuota: 5242881, |
221 | videoQuotaDaily: 318742 | 221 | videoQuotaDaily: 318742 |
222 | }, | 222 | }, |
223 | videoChannels: { | ||
224 | maxPerUser: 20 | ||
225 | }, | ||
223 | transcoding: { | 226 | transcoding: { |
224 | enabled: true, | 227 | enabled: true, |
225 | allowAdditionalExtensions: true, | 228 | allowAdditionalExtensions: true, |
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index 75d04423a..322fbb797 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts | |||
@@ -85,6 +85,10 @@ export interface CustomConfig { | |||
85 | videoQuotaDaily: number | 85 | videoQuotaDaily: number |
86 | } | 86 | } |
87 | 87 | ||
88 | videoChannels: { | ||
89 | maxPerUser: number | ||
90 | } | ||
91 | |||
88 | transcoding: { | 92 | transcoding: { |
89 | enabled: boolean | 93 | enabled: boolean |
90 | 94 | ||
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index a0313b8da..e75eefd47 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts | |||
@@ -203,6 +203,10 @@ export interface ServerConfig { | |||
203 | videoQuotaDaily: number | 203 | videoQuotaDaily: number |
204 | } | 204 | } |
205 | 205 | ||
206 | videoChannels: { | ||
207 | maxPerUser: number | ||
208 | } | ||
209 | |||
206 | trending: { | 210 | trending: { |
207 | videos: { | 211 | videos: { |
208 | intervalDays: number | 212 | intervalDays: number |