import { ActivityPubActorType } from '../../shared/models/activitypub'
import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../initializers'
import { AccountModel } from '../models/account/account'
import { UserModel } from '../models/account/user'
import { buildActorInstance, getAccountActivityPubUrl, setAsyncActorKeys } from './activitypub'
import { createVideoChannel } from './video-channel'
import { ActivityPubActorType } from '../../shared/models/activitypub'
import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../initializers'
import { AccountModel } from '../models/account/account'
import { UserModel } from '../models/account/user'
import { buildActorInstance, getAccountActivityPubUrl, setAsyncActorKeys } from './activitypub'
import { createVideoChannel } from './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 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)
+ userCreated.Account = accountCreated
- const videoChannelName = `Default ${userCreated.username} channel`
+ let channelName = userCreated.username + '_channel'
+
+ // Conflict, generate uuid instead
+ const actor = await ActorModel.loadLocalByName(channelName)
+ if (actor) channelName = uuidv4()
+
+ const videoChannelDisplayName = `Main ${userCreated.username} channel`
})
account.Actor = await setAsyncActorKeys(account.Actor)
videoChannel.Actor = await setAsyncActorKeys(videoChannel.Actor)
})
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 }
- actorId: actorInstanceCreated.id,
- serverId: null // It is our server
- })
+ actorId: actorInstanceCreated.id
+ } as FilteredModelAttributes<AccountModel>)
const accountInstanceCreated = await accountInstance.save({ transaction: t })
accountInstanceCreated.Actor = actorInstanceCreated
const accountInstanceCreated = await accountInstance.save({ transaction: t })
accountInstanceCreated.Actor = actorInstanceCreated