X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fuser.ts;h=0d292ac90abcc0bf642db88c79e8b60d9df60d24;hb=d0800f7661f13fabe7bb6f4aa0ea50764f106405;hp=91a682a7e79debdbb89fbe36c02de997ccf45f05;hpb=eae0365b5c5468e51e9795b0e894815ebda86b4a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/user.ts b/server/lib/user.ts
index 91a682a7e..0d292ac90 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -1,7 +1,7 @@
 import { Transaction } from 'sequelize/types'
-import { v4 as uuidv4 } from 'uuid'
 import { UserModel } from '@server/models/user/user'
 import { MActorDefault } from '@server/types/models/actor'
+import { buildUUID } from '@shared/extra-utils'
 import { ActivityPubActorType } from '../../shared/models/activitypub'
 import { UserNotificationSetting, UserNotificationSettingValue } from '../../shared/models/users'
 import { SERVER_ACTOR_NAME, WEBSERVER } from '../initializers/constants'
@@ -14,7 +14,7 @@ import { MUser, MUserDefault, MUserId } from '../types/models/user'
 import { generateAndSaveActorKeys } from './activitypub/actors'
 import { getLocalAccountActivityPubUrl } from './activitypub/url'
 import { Emailer } from './emailer'
-import { LiveManager } from './live-manager'
+import { LiveQuotaStore } from './live/live-quota-store'
 import { buildActorInstance } from './local-actor'
 import { Redis } from './redis'
 import { createLocalVideoChannel } from './video-channel'
@@ -129,7 +129,7 @@ async function getOriginalVideoFileTotalFromUser (user: MUserId) {
 
   const base = await UserModel.getTotalRawQuery(query, user.id)
 
-  return base + LiveManager.Instance.getLiveQuotaUsedByUser(user.id)
+  return base + LiveQuotaStore.Instance.getLiveQuotaOf(user.id)
 }
 
 // Returns cumulative size of all video files uploaded in the last 24 hours.
@@ -143,10 +143,10 @@ async function getOriginalVideoFileTotalDailyFromUser (user: MUserId) {
 
   const base = await UserModel.getTotalRawQuery(query, user.id)
 
-  return base + LiveManager.Instance.getLiveQuotaUsedByUser(user.id)
+  return base + LiveQuotaStore.Instance.getLiveQuotaOf(user.id)
 }
 
-async function isAbleToUploadVideo (userId: number, size: number) {
+async function isAbleToUploadVideo (userId: number, newVideoSize: number) {
   const user = await UserModel.loadById(userId)
 
   if (user.videoQuota === -1 && user.videoQuotaDaily === -1) return Promise.resolve(true)
@@ -156,8 +156,8 @@ async function isAbleToUploadVideo (userId: number, size: number) {
     getOriginalVideoFileTotalDailyFromUser(user)
   ])
 
-  const uploadedTotal = size + totalBytes
-  const uploadedDaily = size + totalBytesDaily
+  const uploadedTotal = newVideoSize + totalBytes
+  const uploadedDaily = newVideoSize + totalBytesDaily
 
   if (user.videoQuotaDaily === -1) return uploadedTotal < user.videoQuota
   if (user.videoQuota === -1) return uploadedDaily < user.videoQuotaDaily
@@ -210,7 +210,7 @@ async function buildChannelAttributes (user: MUser, transaction?: Transaction, c
 
   // Conflict, generate uuid instead
   const actor = await ActorModel.loadLocalByName(channelName, transaction)
-  if (actor) channelName = uuidv4()
+  if (actor) channelName = buildUUID()
 
   const videoChannelDisplayName = `Main ${user.username} channel`