import * as Sequelize from 'sequelize'
+import * as uuidv4 from 'uuid/v4'
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 { VideoChannelModel } from '../models/video/video-channel'
+import { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model'
+import { ActorModel } from '../models/activitypub/actor'
-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(userCreated.username, userCreated.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`
const videoChannelInfo = {
- name: videoChannelName
+ name: channelName,
+ 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)
+ const [ accountKeys, channelKeys ] = await Promise.all([
+ setAsyncActorKeys(account.Actor),
+ setAsyncActorKeys(videoChannel.Actor)
+ ])
- return { account, videoChannel }
+ account.Actor = accountKeys
+ videoChannel.Actor = channelKeys
+
+ return { user, account, videoChannel } as { user: UserModel, account: AccountModel, videoChannel: VideoChannelModel }
}
async function createLocalAccountWithoutKeys (
name: string,
- userId: number,
- applicationId: number,
- t: Sequelize.Transaction,
+ userId: number | null,
+ applicationId: number | null,
+ t: Sequelize.Transaction | undefined,
type: ActivityPubActorType= 'Person'
) {
const url = getAccountActivityPubUrl(name)
name,
userId,
applicationId,
- 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