1 files changed, 13 insertions, 6 deletions

diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index 97924aa9e..569b8f29d 100644
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -1,26 +1,33 @@
 import * as Sequelize from 'sequelize'
+import * as uuidv4 from 'uuid/v4'
 import { VideoChannelCreate } from '../../shared/models'
 import { AccountModel } from '../models/account/account'
 import { VideoChannelModel } from '../models/video/video-channel'
-import { getVideoChannelActivityPubUrl } from './activitypub'
+import { buildActorInstance, getVideoChannelActivityPubUrl } from './activitypub'
 
 async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountModel, t: Sequelize.Transaction) {
+  const uuid = uuidv4()
+  const url = getVideoChannelActivityPubUrl(uuid)
+  // We use the name as uuid
+  const actorInstance = buildActorInstance('Group', url, uuid, uuid)
+
+  const actorInstanceCreated = await actorInstance.save({ transaction: t })
+
   const videoChannelData = {
     name: videoChannelInfo.name,
     description: videoChannelInfo.description,
-    remote: false,
-    accountId: account.id
+    accountId: account.id,
+    actorId: actorInstanceCreated.id
   }
 
   const videoChannel = VideoChannelModel.build(videoChannelData)
-  videoChannel.set('url', getVideoChannelActivityPubUrl(videoChannel))
 
   const options = { transaction: t }
-
   const videoChannelCreated = await videoChannel.save(options)
 
-  // Do not forget to add Account information to the created video channel
+  // Do not forget to add Account/Actor information to the created video channel
   videoChannelCreated.Account = account
+  videoChannelCreated.Actor = actorInstanceCreated
 
   // No need to seed this empty video channel to followers
   return videoChannelCreated