aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-11-14 10:57:56 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-11-27 19:40:51 +0100
commite34c85e527100c0b5c44567bd951e95be41b8d7e (patch)
tree39697c5a4dda2c2e07142a8522538db783fce2fd /server/lib
parent1e1265b36c09df1465aa2b4866815c957b6a532e (diff)
downloadPeerTube-e34c85e527100c0b5c44567bd951e95be41b8d7e.tar.gz
PeerTube-e34c85e527100c0b5c44567bd951e95be41b8d7e.tar.zst
PeerTube-e34c85e527100c0b5c44567bd951e95be41b8d7e.zip
Fix issues on server start
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/user.ts3
-rw-r--r--server/lib/video-channel.ts3
2 files changed, 5 insertions, 1 deletions
diff --git a/server/lib/user.ts b/server/lib/user.ts
index 1094c2401..d2d599dfd 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -16,8 +16,9 @@ async function createUserAccountAndChannel (user: UserInstance, validateUser = t
16 const userCreated = await user.save(userOptions) 16 const userCreated = await user.save(userOptions)
17 const accountCreated = await createLocalAccount(user.username, user.id, null, t) 17 const accountCreated = await createLocalAccount(user.username, user.id, null, t)
18 18
19 const videoChannelName = `Default ${userCreated.username} channel`
19 const videoChannelInfo = { 20 const videoChannelInfo = {
20 name: `Default ${userCreated.username} channel` 21 name: videoChannelName
21 } 22 }
22 const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t) 23 const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t)
23 24
diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index 459d9d4a8..13841ea33 100644
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -5,6 +5,7 @@ import { logger } from '../helpers'
5import { AccountInstance } from '../models' 5import { AccountInstance } from '../models'
6import { VideoChannelCreate } from '../../shared/models' 6import { VideoChannelCreate } from '../../shared/models'
7import { sendCreateVideoChannel } from './activitypub/send-request' 7import { sendCreateVideoChannel } from './activitypub/send-request'
8import { getActivityPubUrl } from '../helpers/activitypub'
8 9
9async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountInstance, t: Sequelize.Transaction) { 10async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountInstance, t: Sequelize.Transaction) {
10 const videoChannelData = { 11 const videoChannelData = {
@@ -15,6 +16,8 @@ async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account
15 } 16 }
16 17
17 const videoChannel = db.VideoChannel.build(videoChannelData) 18 const videoChannel = db.VideoChannel.build(videoChannelData)
19 videoChannel.set('url', getActivityPubUrl('videoChannel', videoChannel.uuid))
20
18 const options = { transaction: t } 21 const options = { transaction: t }
19 22
20 const videoChannelCreated = await videoChannel.save(options) 23 const videoChannelCreated = await videoChannel.save(options)