From bee0abffff73804d816b90c7fd599e0a51c09d61 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 28 Aug 2018 02:01:35 -0500 Subject: 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 --- shared/models/server/custom-config.model.ts | 1 + shared/models/server/server-config.model.ts | 1 + shared/models/users/user-create.model.ts | 1 + shared/models/users/user-update.model.ts | 1 + shared/models/users/user-video-quota.model.ts | 1 + shared/models/users/user.model.ts | 1 + 6 files changed, 6 insertions(+) (limited to 'shared') diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index d70c757b6..2f5cebf7f 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts @@ -42,6 +42,7 @@ export interface CustomConfig { user: { videoQuota: number + videoQuotaDaily: number } transcoding: { diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index 8cb087234..9bbeb14d2 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts @@ -66,5 +66,6 @@ export interface ServerConfig { user: { videoQuota: number + videoQuotaDaily: number } } 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 { password: string email: string videoQuota: number + videoQuotaDaily: number role: UserRole } 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' export interface UserUpdate { email?: string videoQuota?: number + videoQuotaDaily?: number role?: UserRole } 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 @@ export interface UserVideoQuota { videoQuotaUsed: number + videoQuotaUsedDaily: number } 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 { autoPlayVideo: boolean role: UserRole videoQuota: number + videoQuotaDaily: number createdAt: Date account: Account videoChannels?: VideoChannel[] -- cgit v1.2.3