Video channel API routes refractor

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

diff --git a/server/lib/user.ts b/server/lib/user.ts
index aa029cce77d0bc90507d289f85f0f45701407ef4..d019c4e719b44f7c51fc27f91711fe8e284d60b6 100644 (file)
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -5,6 +5,7 @@ import { AccountModel } from '../models/account/account'
 import { UserModel } from '../models/account/user'
 import { buildActorInstance, getAccountActivityPubUrl, setAsyncActorKeys } from './activitypub'
 import { createVideoChannel } from './video-channel'
+import { VideoChannelModel } from '../models/video/video-channel'
 
 async function createUserAccountAndChannel (userToCreate: UserModel, validateUser = true) {
   const { user, account, videoChannel } = await sequelizeTypescript.transaction(async t => {
@@ -28,7 +29,7 @@ async function createUserAccountAndChannel (userToCreate: UserModel, validateUse
   account.Actor = await setAsyncActorKeys(account.Actor)
   videoChannel.Actor = await setAsyncActorKeys(videoChannel.Actor)
 
-  return { user, account, videoChannel }
+  return { user, account, videoChannel } as { user: UserModel, account: AccountModel, videoChannel: VideoChannelModel }
 }
 
 async function createLocalAccountWithoutKeys (
@@ -47,8 +48,7 @@ async function createLocalAccountWithoutKeys (
     name,
     userId,
     applicationId,
-    actorId: actorInstanceCreated.id,
-    serverId: null // It is our server
+    actorId: actorInstanceCreated.id
   })
 
   const accountInstanceCreated = await accountInstance.save({ transaction: t })