Upgrade sequelize to v6

[github/Chocobozzz/PeerTube.git] / server / lib / user.ts

diff --git a/server/lib/user.ts b/server/lib/user.ts
index d3338f329467b4b6b184715256dac7eb4344cbc6..6b0fd9b8867499c82d8fed55ef4652f3a84613da 100644 (file)
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -11,15 +11,13 @@ import { ActorModel } from '../models/activitypub/actor'
 import { MAccountDefault, MActorDefault, MChannelActor } from '../types/models'
 import { MUser, MUserDefault, MUserId } from '../types/models/user'
 import { buildActorInstance, setAsyncActorKeys } from './activitypub/actor'
-import { getAccountActivityPubUrl } from './activitypub/url'
+import { getLocalAccountActivityPubUrl } from './activitypub/url'
 import { Emailer } from './emailer'
 import { LiveManager } from './live-manager'
 import { Redis } from './redis'
 import { createLocalVideoChannel } from './video-channel'
 import { createWatchLaterPlaylist } from './video-playlist'
 
-import memoizee = require('memoizee')
-
 type ChannelNames = { name: string, displayName: string }
 
 async function createUserAccountAndChannelAndPlaylist (parameters: {
@@ -76,7 +74,7 @@ async function createLocalAccountWithoutKeys (parameters: {
   type?: ActivityPubActorType
 }) {
   const { name, displayName, userId, applicationId, t, type = 'Person' } = parameters
-  const url = getAccountActivityPubUrl(name)
+  const url = getLocalAccountActivityPubUrl(name)
 
   const actorInstance = buildActorInstance(type, url, name)
   const actorInstanceCreated: MActorDefault = await actorInstance.save({ transaction: t })
@@ -152,8 +150,8 @@ async function isAbleToUploadVideo (userId: number, size: number) {
   if (user.videoQuota === -1 && user.videoQuotaDaily === -1) return Promise.resolve(true)
 
   const [ totalBytes, totalBytesDaily ] = await Promise.all([
-    getOriginalVideoFileTotalFromUser(user.id),
-    getOriginalVideoFileTotalDailyFromUser(user.id)
+    getOriginalVideoFileTotalFromUser(user),
+    getOriginalVideoFileTotalDailyFromUser(user)
   ])
 
   const uploadedTotal = size + totalBytes