diff options
author | Felix Ableitner <me@nutomic.com> | 2018-08-28 02:01:35 -0500 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-28 09:01:35 +0200 |
commit | bee0abffff73804d816b90c7fd599e0a51c09d61 (patch) | |
tree | fae6d58637f9c63a3800090277f8e130b43442dd /shared/models/users | |
parent | c907c2fa3fd7c0a741117a0204d0ebca675124bd (diff) | |
download | PeerTube-bee0abffff73804d816b90c7fd599e0a51c09d61.tar.gz PeerTube-bee0abffff73804d816b90c7fd599e0a51c09d61.tar.zst PeerTube-bee0abffff73804d816b90c7fd599e0a51c09d61.zip |
Implement daily upload limit (#956)
* Implement daily upload limit (ref #652)
* remove duplicate code
* review fixes
* fix tests?
* whitespace fixes, finish leftover todo
* fix tests
* added some new tests
* use different config value for tests
* remove todo
Diffstat (limited to 'shared/models/users')
-rw-r--r-- | shared/models/users/user-create.model.ts | 1 | ||||
-rw-r--r-- | shared/models/users/user-update.model.ts | 1 | ||||
-rw-r--r-- | shared/models/users/user-video-quota.model.ts | 1 | ||||
-rw-r--r-- | shared/models/users/user.model.ts | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/shared/models/users/user-create.model.ts b/shared/models/users/user-create.model.ts index 65830f55e..08be4db05 100644 --- a/shared/models/users/user-create.model.ts +++ b/shared/models/users/user-create.model.ts | |||
@@ -5,5 +5,6 @@ export interface UserCreate { | |||
5 | password: string | 5 | password: string |
6 | email: string | 6 | email: string |
7 | videoQuota: number | 7 | videoQuota: number |
8 | videoQuotaDaily: number | ||
8 | role: UserRole | 9 | role: UserRole |
9 | } | 10 | } |
diff --git a/shared/models/users/user-update.model.ts b/shared/models/users/user-update.model.ts index 96b454b7c..ce866fb18 100644 --- a/shared/models/users/user-update.model.ts +++ b/shared/models/users/user-update.model.ts | |||
@@ -3,5 +3,6 @@ import { UserRole } from './user-role' | |||
3 | export interface UserUpdate { | 3 | export interface UserUpdate { |
4 | email?: string | 4 | email?: string |
5 | videoQuota?: number | 5 | videoQuota?: number |
6 | videoQuotaDaily?: number | ||
6 | role?: UserRole | 7 | role?: UserRole |
7 | } | 8 | } |
diff --git a/shared/models/users/user-video-quota.model.ts b/shared/models/users/user-video-quota.model.ts index b856fd9fc..a24871d71 100644 --- a/shared/models/users/user-video-quota.model.ts +++ b/shared/models/users/user-video-quota.model.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | export interface UserVideoQuota { | 1 | export interface UserVideoQuota { |
2 | videoQuotaUsed: number | 2 | videoQuotaUsed: number |
3 | videoQuotaUsedDaily: number | ||
3 | } | 4 | } |
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts index 455211aa3..8147dc48e 100644 --- a/shared/models/users/user.model.ts +++ b/shared/models/users/user.model.ts | |||
@@ -11,6 +11,7 @@ export interface User { | |||
11 | autoPlayVideo: boolean | 11 | autoPlayVideo: boolean |
12 | role: UserRole | 12 | role: UserRole |
13 | videoQuota: number | 13 | videoQuota: number |
14 | videoQuotaDaily: number | ||
14 | createdAt: Date | 15 | createdAt: Date |
15 | account: Account | 16 | account: Account |
16 | videoChannels?: VideoChannel[] | 17 | videoChannels?: VideoChannel[] |