|
@@ -2,9 +2,8 @@ import * as uuidv4 from 'uuid/v4'
|
|
|
import { ActivityPubActorType } from '../../shared/models/activitypub'
|
|
|
import { SERVER_ACTOR_NAME, WEBSERVER } from '../initializers/constants'
|
|
|
import { AccountModel } from '../models/account/account'
|
|
|
-import { UserModel } from '../models/account/user'
|
|
|
import { buildActorInstance, getAccountActivityPubUrl, setAsyncActorKeys } from './activitypub'
|
|
|
-import { createVideoChannel } from './video-channel'
|
|
|
+import { createLocalVideoChannel } from './video-channel'
|
|
|
import { ActorModel } from '../models/activitypub/actor'
|
|
|
import { UserNotificationSettingModel } from '../models/account/user-notification-setting'
|
|
|
import { UserNotificationSetting, UserNotificationSettingValue } from '../../shared/models/users'
|
|
@@ -13,17 +12,17 @@ import { sequelizeTypescript } from '../initializers/database'
|
|
|
import { Transaction } from 'sequelize/types'
|
|
|
import { Redis } from './redis'
|
|
|
import { Emailer } from './emailer'
|
|
|
-import { MAccountActor, MActor, MChannelActor } from '../typings/models'
|
|
|
-import { MUser, MUserId, MUserNotifSettingAccount } from '../typings/models/user'
|
|
|
+import { MAccountDefault, MActorDefault, MChannelActor } from '../typings/models'
|
|
|
+import { MUser, MUserDefault, MUserId } from '../typings/models/user'
|
|
|
|
|
|
type ChannelNames = { name: string, displayName: string }
|
|
|
|
|
|
async function createUserAccountAndChannelAndPlaylist (parameters: {
|
|
|
- userToCreate: UserModel,
|
|
|
+ userToCreate: MUser,
|
|
|
userDisplayName?: string,
|
|
|
channelNames?: ChannelNames,
|
|
|
validateUser?: boolean
|
|
|
-}): Promise<{ user: MUserNotifSettingAccount, account: MAccountActor, videoChannel: MChannelActor }> {
|
|
|
+}): Promise<{ user: MUserDefault, account: MAccountDefault, videoChannel: MChannelActor }> {
|
|
|
const { userToCreate, userDisplayName, channelNames, validateUser = true } = parameters
|
|
|
|
|
|
const { user, account, videoChannel } = await sequelizeTypescript.transaction(async t => {
|
|
@@ -32,7 +31,7 @@ async function createUserAccountAndChannelAndPlaylist (parameters: {
|
|
|
validate: validateUser
|
|
|
}
|
|
|
|
|
|
- const userCreated: MUserNotifSettingAccount = await userToCreate.save(userOptions)
|
|
|
+ const userCreated: MUserDefault = await userToCreate.save(userOptions)
|
|
|
userCreated.NotificationSetting = await createDefaultUserNotificationSettings(userCreated, t)
|
|
|
|
|
|
const accountCreated = await createLocalAccountWithoutKeys({
|
|
@@ -45,7 +44,7 @@ async function createUserAccountAndChannelAndPlaylist (parameters: {
|
|
|
userCreated.Account = accountCreated
|
|
|
|
|
|
const channelAttributes = await buildChannelAttributes(userCreated, channelNames)
|
|
|
- const videoChannel = await createVideoChannel(channelAttributes, accountCreated, t)
|
|
|
+ const videoChannel = await createLocalVideoChannel(channelAttributes, accountCreated, t)
|
|
|
|
|
|
const videoPlaylist = await createWatchLaterPlaylist(accountCreated, t)
|
|
|
|
|
@@ -75,7 +74,7 @@ async function createLocalAccountWithoutKeys (parameters: {
|
|
|
const url = getAccountActivityPubUrl(name)
|
|
|
|
|
|
const actorInstance = buildActorInstance(type, url, name)
|
|
|
- const actorInstanceCreated: MActor = await actorInstance.save({ transaction: t })
|
|
|
+ const actorInstanceCreated: MActorDefault = await actorInstance.save({ transaction: t })
|
|
|
|
|
|
const accountInstance = new AccountModel({
|
|
|
name: displayName || name,
|
|
@@ -84,7 +83,7 @@ async function createLocalAccountWithoutKeys (parameters: {
|
|
|
actorId: actorInstanceCreated.id
|
|
|
})
|
|
|
|
|
|
- const accountInstanceCreated: MAccountActor = await accountInstance.save({ transaction: t })
|
|
|
+ const accountInstanceCreated: MAccountDefault = await accountInstance.save({ transaction: t })
|
|
|
accountInstanceCreated.Actor = actorInstanceCreated
|
|
|
|
|
|
return accountInstanceCreated
|