diff options
Diffstat (limited to 'server/lib/user.ts')
-rw-r--r-- | server/lib/user.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/lib/user.ts b/server/lib/user.ts index 91a682a7e..8820e8243 100644 --- a/server/lib/user.ts +++ b/server/lib/user.ts | |||
@@ -14,7 +14,7 @@ import { MUser, MUserDefault, MUserId } from '../types/models/user' | |||
14 | import { generateAndSaveActorKeys } from './activitypub/actors' | 14 | import { generateAndSaveActorKeys } from './activitypub/actors' |
15 | import { getLocalAccountActivityPubUrl } from './activitypub/url' | 15 | import { getLocalAccountActivityPubUrl } from './activitypub/url' |
16 | import { Emailer } from './emailer' | 16 | import { Emailer } from './emailer' |
17 | import { LiveManager } from './live-manager' | 17 | import { LiveQuotaStore } from './live/live-quota-store' |
18 | import { buildActorInstance } from './local-actor' | 18 | import { buildActorInstance } from './local-actor' |
19 | import { Redis } from './redis' | 19 | import { Redis } from './redis' |
20 | import { createLocalVideoChannel } from './video-channel' | 20 | import { createLocalVideoChannel } from './video-channel' |
@@ -129,7 +129,7 @@ async function getOriginalVideoFileTotalFromUser (user: MUserId) { | |||
129 | 129 | ||
130 | const base = await UserModel.getTotalRawQuery(query, user.id) | 130 | const base = await UserModel.getTotalRawQuery(query, user.id) |
131 | 131 | ||
132 | return base + LiveManager.Instance.getLiveQuotaUsedByUser(user.id) | 132 | return base + LiveQuotaStore.Instance.getLiveQuotaOf(user.id) |
133 | } | 133 | } |
134 | 134 | ||
135 | // Returns cumulative size of all video files uploaded in the last 24 hours. | 135 | // Returns cumulative size of all video files uploaded in the last 24 hours. |
@@ -143,10 +143,10 @@ async function getOriginalVideoFileTotalDailyFromUser (user: MUserId) { | |||
143 | 143 | ||
144 | const base = await UserModel.getTotalRawQuery(query, user.id) | 144 | const base = await UserModel.getTotalRawQuery(query, user.id) |
145 | 145 | ||
146 | return base + LiveManager.Instance.getLiveQuotaUsedByUser(user.id) | 146 | return base + LiveQuotaStore.Instance.getLiveQuotaOf(user.id) |
147 | } | 147 | } |
148 | 148 | ||
149 | async function isAbleToUploadVideo (userId: number, size: number) { | 149 | async function isAbleToUploadVideo (userId: number, newVideoSize: number) { |
150 | const user = await UserModel.loadById(userId) | 150 | const user = await UserModel.loadById(userId) |
151 | 151 | ||
152 | if (user.videoQuota === -1 && user.videoQuotaDaily === -1) return Promise.resolve(true) | 152 | if (user.videoQuota === -1 && user.videoQuotaDaily === -1) return Promise.resolve(true) |
@@ -156,8 +156,8 @@ async function isAbleToUploadVideo (userId: number, size: number) { | |||
156 | getOriginalVideoFileTotalDailyFromUser(user) | 156 | getOriginalVideoFileTotalDailyFromUser(user) |
157 | ]) | 157 | ]) |
158 | 158 | ||
159 | const uploadedTotal = size + totalBytes | 159 | const uploadedTotal = newVideoSize + totalBytes |
160 | const uploadedDaily = size + totalBytesDaily | 160 | const uploadedDaily = newVideoSize + totalBytesDaily |
161 | 161 | ||
162 | if (user.videoQuotaDaily === -1) return uploadedTotal < user.videoQuota | 162 | if (user.videoQuotaDaily === -1) return uploadedTotal < user.videoQuota |
163 | if (user.videoQuota === -1) return uploadedDaily < user.videoQuotaDaily | 163 | if (user.videoQuota === -1) return uploadedDaily < user.videoQuotaDaily |