X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fuser.ts;h=51050de9b2a927a7fcb3f238d7f5f3f95680b71a;hb=9588d4f49b7183631ddb97fa9c3cd79f9bfe2945;hp=2ea7481e8152b09ce9fc11ff75bd178951ed9e89;hpb=c39ea24b7199a391e57c698e93d76d30bc0e9399;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/user.ts b/server/lib/user.ts index 2ea7481e8..51050de9b 100644 --- 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 => { @@ -16,9 +17,9 @@ async function createUserAccountAndChannel (userToCreate: UserModel, validateUse const userCreated = await userToCreate.save(userOptions) const accountCreated = await createLocalAccountWithoutKeys(userToCreate.username, userToCreate.id, null, t) - const videoChannelName = `Default ${userCreated.username} channel` + const videoChannelDisplayName = `Default ${userCreated.username} channel` const videoChannelInfo = { - name: videoChannelName + displayName: videoChannelDisplayName } const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, 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 (