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 (user: UserModel, validateUser = true) {
- const { account, videoChannel } = await sequelizeTypescript.transaction(async t => {
+async function createUserAccountAndChannel (userToCreate: UserModel, validateUser = true) {
+ const { user, account, videoChannel } = await sequelizeTypescript.transaction(async t => {
const userOptions = {
transaction: t,
validate: validateUser
}
- const userCreated = await user.save(userOptions)
- const accountCreated = await createLocalAccountWithoutKeys(user.username, user.id, null, t)
+ 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)
- return { account: accountCreated, videoChannel }
+ return { user: userCreated, account: accountCreated, videoChannel }
})
account.Actor = await setAsyncActorKeys(account.Actor)
videoChannel.Actor = await setAsyncActorKeys(videoChannel.Actor)
- return { account, videoChannel }
+ return { user, account, videoChannel } as { user: UserModel, account: AccountModel, videoChannel: VideoChannelModel }
}
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 })