yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Add ability to specify channel on registration

Browse source
This commit is contained in:
Chocobozzz 2019-05-28 10:46:32 +02:00
parent cce1b3dfd3
commit e590b4a512
No known key found for this signature in database
GPG key ID: 583A612D890159BE
8 changed files with 120 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
server/lib/user.ts
View file

@ -13,7 +13,8 @@ import { UserNotificationSetting, UserNotificationSettingValue } from '../../sha
import { createWatchLaterPlaylist } from './video-playlist'
import { sequelizeTypescript } from '../initializers/database'
async function createUserAccountAndChannelAndPlaylist (userToCreate: UserModel, validateUser = true) {
type ChannelNames = { name: string, displayName: string }
async function createUserAccountAndChannelAndPlaylist (userToCreate: UserModel, channelNames?: ChannelNames, validateUser = true) {
const { user, account, videoChannel } = await sequelizeTypescript.transaction(async t => {
const userOptions = {
transaction: t,
@ -26,18 +27,8 @@ async function createUserAccountAndChannelAndPlaylist (userToCreate: UserModel,
const accountCreated = await createLocalAccountWithoutKeys(userCreated.username, userCreated.id, null, t)
userCreated.Account = accountCreated
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: channelName,
displayName: videoChannelDisplayName
}
const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t)
const channelAttributes = await buildChannelAttributes(userCreated, channelNames)
const videoChannel = await createVideoChannel(channelAttributes, accountCreated, t)
const videoPlaylist = await createWatchLaterPlaylist(accountCreated, t)
@ -116,3 +107,20 @@ function createDefaultUserNotificationSettings (user: UserModel, t: Sequelize.Tr
return UserNotificationSettingModel.create(values, { transaction: t })
}
async function buildChannelAttributes (user: UserModel, 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
}
}