aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
authorWicklow <123956049+wickloww@users.noreply.github.com>2023-04-07 08:09:54 +0000
committerGitHub <noreply@github.com>2023-04-07 10:09:54 +0200
commitb302c80dc0d9ba8eabef9ef6576efe36afc57584 (patch)
tree14d406b41291805deb94a36a5e79f8d6989355f8 /shared
parent9258e9a4a37911fc64b5faada2a7e604bd1ede1f (diff)
downloadPeerTube-b302c80dc0d9ba8eabef9ef6576efe36afc57584.tar.gz
PeerTube-b302c80dc0d9ba8eabef9ef6576efe36afc57584.tar.zst
PeerTube-b302c80dc0d9ba8eabef9ef6576efe36afc57584.zip
feature/ability to disable video history by default (#5728)
* draft: ability to disable video history by default * Update configuration and add tests * Updated code based on review comments * Add tests on registration and video quota * Remove required video quotas in query * Fix tests
Diffstat (limited to 'shared')
-rw-r--r--shared/models/server/custom-config.model.ts6
-rw-r--r--shared/server-commands/server/config-command.ts5
-rw-r--r--shared/server-commands/users/users-command.ts4
3 files changed, 13 insertions, 2 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 846bf6159..6ffe3a676 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -97,6 +97,11 @@ export interface CustomConfig {
97 } 97 }
98 98
99 user: { 99 user: {
100 history: {
101 videos: {
102 enabled: boolean
103 }
104 }
100 videoQuota: number 105 videoQuota: number
101 videoQuotaDaily: number 106 videoQuotaDaily: number
102 } 107 }
@@ -229,4 +234,5 @@ export interface CustomConfig {
229 isDefaultSearch: boolean 234 isDefaultSearch: boolean
230 } 235 }
231 } 236 }
237
232} 238}
diff --git a/shared/server-commands/server/config-command.ts b/shared/server-commands/server/config-command.ts
index eb6bb95a5..303fcab88 100644
--- a/shared/server-commands/server/config-command.ts
+++ b/shared/server-commands/server/config-command.ts
@@ -350,6 +350,11 @@ export class ConfigCommand extends AbstractCommand {
350 enabled: true 350 enabled: true
351 }, 351 },
352 user: { 352 user: {
353 history: {
354 videos: {
355 enabled: true
356 }
357 },
353 videoQuota: 5242881, 358 videoQuota: 5242881,
354 videoQuotaDaily: 318742 359 videoQuotaDaily: 318742
355 }, 360 },
diff --git a/shared/server-commands/users/users-command.ts b/shared/server-commands/users/users-command.ts
index 8a42fafc8..5b39d3488 100644
--- a/shared/server-commands/users/users-command.ts
+++ b/shared/server-commands/users/users-command.ts
@@ -165,8 +165,8 @@ export class UsersCommand extends AbstractCommand {
165 username, 165 username,
166 adminFlags, 166 adminFlags,
167 password = 'password', 167 password = 'password',
168 videoQuota = 42000000, 168 videoQuota,
169 videoQuotaDaily = -1, 169 videoQuotaDaily,
170 role = UserRole.USER 170 role = UserRole.USER
171 } = options 171 } = options
172 172