-import * as Sequelize from 'sequelize'
-import * as uuidv4 from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
import { ActivityPubActorType } from '../../shared/models/activitypub'
-import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../initializers'
+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 { VideoChannelModel } from '../models/video/video-channel'
-import { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model'
+import { buildActorInstance, setAsyncActorKeys } from './activitypub/actor'
+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'
+import { createWatchLaterPlaylist } from './video-playlist'
+import { sequelizeTypescript } from '../initializers/database'
+import { Transaction } from 'sequelize/types'
+import { Redis } from './redis'
+import { Emailer } from './emailer'
+import { MAccountDefault, MActorDefault, MChannelActor } from '../types/models'
+import { MUser, MUserDefault, MUserId } from '../types/models/user'
+import { getAccountActivityPubUrl } from './activitypub/url'
+
+type ChannelNames = { name: string, displayName: string }
+
+async function createUserAccountAndChannelAndPlaylist (parameters: {
+ userToCreate: MUser
+ userDisplayName?: string
+ channelNames?: ChannelNames
+ validateUser?: boolean
+}): Promise<{ user: MUserDefault, account: MAccountDefault, videoChannel: MChannelActor }> {
+ const { userToCreate, userDisplayName, channelNames, validateUser = true } = parameters
-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 userToCreate.save(userOptions)
- const accountCreated = await createLocalAccountWithoutKeys(userToCreate.username, userToCreate.id, null, t)
- userCreated.Account = accountCreated
+ const userCreated: MUserDefault = await userToCreate.save(userOptions)
+ userCreated.NotificationSetting = await createDefaultUserNotificationSettings(userCreated, t)
- let channelName = userCreated.username + '_channel'
+ const accountCreated = await createLocalAccountWithoutKeys({
+ name: userCreated.username,
+ displayName: userDisplayName,
+ userId: userCreated.id,
+ applicationId: null,
+ t: t
+ })
+ userCreated.Account = accountCreated
- // Conflict, generate uuid instead
- const actor = await ActorModel.loadLocalByName(channelName)
- if (actor) channelName = uuidv4()
+ const channelAttributes = await buildChannelAttributes(userCreated, channelNames)
+ const videoChannel = await createLocalVideoChannel(channelAttributes, accountCreated, t)
- const videoChannelDisplayName = `Main ${userCreated.username} channel`
- const videoChannelInfo = {
- name: channelName,
- displayName: videoChannelDisplayName
- }
- const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t)
+ const videoPlaylist = await createWatchLaterPlaylist(accountCreated, t)
- return { user: userCreated, account: accountCreated, videoChannel }
+ return { user: userCreated, account: accountCreated, videoChannel, videoPlaylist }
})
- account.Actor = await setAsyncActorKeys(account.Actor)
- videoChannel.Actor = await setAsyncActorKeys(videoChannel.Actor)
+ const [ accountActorWithKeys, channelActorWithKeys ] = await Promise.all([
+ setAsyncActorKeys(account.Actor),
+ setAsyncActorKeys(videoChannel.Actor)
+ ])
- return { user, account, videoChannel } as { user: UserModel, account: AccountModel, videoChannel: VideoChannelModel }
+ account.Actor = accountActorWithKeys
+ videoChannel.Actor = channelActorWithKeys
+
+ return { user, account, videoChannel }
}
-async function createLocalAccountWithoutKeys (
- name: string,
- userId: number | null,
- applicationId: number | null,
- t: Sequelize.Transaction | undefined,
- type: ActivityPubActorType= 'Person'
-) {
+async function createLocalAccountWithoutKeys (parameters: {
+ name: string
+ displayName?: string
+ userId: number | null
+ applicationId: number | null
+ t: Transaction | undefined
+ type?: ActivityPubActorType
+}) {
+ const { name, displayName, userId, applicationId, t, type = 'Person' } = parameters
const url = getAccountActivityPubUrl(name)
const actorInstance = buildActorInstance(type, url, name)
- const actorInstanceCreated = await actorInstance.save({ transaction: t })
+ const actorInstanceCreated: MActorDefault = await actorInstance.save({ transaction: t })
const accountInstance = new AccountModel({
- name,
+ name: displayName || name,
userId,
applicationId,
actorId: actorInstanceCreated.id
- } as FilteredModelAttributes<AccountModel>)
+ })
- const accountInstanceCreated = await accountInstance.save({ transaction: t })
+ const accountInstanceCreated: MAccountDefault = await accountInstance.save({ transaction: t })
accountInstanceCreated.Actor = actorInstanceCreated
return accountInstanceCreated
}
async function createApplicationActor (applicationId: number) {
- const accountCreated = await createLocalAccountWithoutKeys(SERVER_ACTOR_NAME, null, applicationId, undefined, 'Application')
+ const accountCreated = await createLocalAccountWithoutKeys({
+ name: SERVER_ACTOR_NAME,
+ userId: null,
+ applicationId: applicationId,
+ t: undefined,
+ type: 'Application'
+ })
accountCreated.Actor = await setAsyncActorKeys(accountCreated.Actor)
return accountCreated
}
+async function sendVerifyUserEmail (user: MUser, isPendingEmail = false) {
+ const verificationString = await Redis.Instance.setVerifyEmailVerificationString(user.id)
+ let url = WEBSERVER.URL + '/verify-account/email?userId=' + user.id + '&verificationString=' + verificationString
+
+ if (isPendingEmail) url += '&isPendingEmail=true'
+
+ const email = isPendingEmail ? user.pendingEmail : user.email
+
+ await Emailer.Instance.addVerifyEmailJob(email, url)
+}
+
// ---------------------------------------------------------------------------
export {
createApplicationActor,
- createUserAccountAndChannel,
- createLocalAccountWithoutKeys
+ createUserAccountAndChannelAndPlaylist,
+ createLocalAccountWithoutKeys,
+ sendVerifyUserEmail
+}
+
+// ---------------------------------------------------------------------------
+
+function createDefaultUserNotificationSettings (user: MUserId, t: Transaction | undefined) {
+ const values: UserNotificationSetting & { userId: number } = {
+ userId: user.id,
+ newVideoFromSubscription: UserNotificationSettingValue.WEB,
+ newCommentOnMyVideo: UserNotificationSettingValue.WEB,
+ myVideoImportFinished: UserNotificationSettingValue.WEB,
+ myVideoPublished: UserNotificationSettingValue.WEB,
+ videoAbuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
+ videoAutoBlacklistAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
+ blacklistOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
+ newUserRegistration: UserNotificationSettingValue.WEB,
+ commentMention: UserNotificationSettingValue.WEB,
+ newFollow: UserNotificationSettingValue.WEB,
+ newInstanceFollower: UserNotificationSettingValue.WEB,
+ autoInstanceFollowing: UserNotificationSettingValue.WEB
+ }
+
+ return UserNotificationSettingModel.create(values, { transaction: t })
+}
+
+async function buildChannelAttributes (user: MUser, channelNames?: ChannelNames) {
+ if (channelNames) return channelNames
+
+ let channelName = user.username + '_channel'
+
+ // Conflict, generate uuid instead
+ const actor = await ActorModel.loadLocalByName(channelName)
+ if (actor) channelName = uuidv4()
+
+ const videoChannelDisplayName = `Main ${user.username} channel`
+
+ return {
+ name: channelName,
+ displayName: videoChannelDisplayName
+ }
}
projects / oweals / peertube.git / blobdiff