X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Flib%2Fvideo-channel.ts;h=600316cda66019008e211cf4e8e41551901ae37c;hb=4a9e71c2b1ef57de01cd04984348b3957ebbc21d;hp=a939a23d5893ef043e3c15ff879a221753cb0574;hpb=892211e8493b1f992fce7616cb1e48b7ff87a1dc;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index a939a23d5..600316cda 100644
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -1,47 +1,41 @@
 import * as Sequelize from 'sequelize'
+import * as uuidv4 from 'uuid/v4'
 import { VideoChannelCreate } from '../../shared/models'
-import { logger } from '../helpers'
-import { database as db } from '../initializers'
-import { AccountInstance } from '../models'
-import { getVideoChannelActivityPubUrl } from './activitypub/url'
+import { AccountModel } from '../models/account/account'
+import { VideoChannelModel } from '../models/video/video-channel'
+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 })
 
-async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountInstance, t: Sequelize.Transaction) {
   const videoChannelData = {
-    name: videoChannelInfo.name,
+    name: videoChannelInfo.displayName,
     description: videoChannelInfo.description,
-    remote: false,
-    accountId: account.id
+    support: videoChannelInfo.support,
+    accountId: account.id,
+    actorId: actorInstanceCreated.id
   }
 
-  const videoChannel = db.VideoChannel.build(videoChannelData)
-  videoChannel.set('url', getVideoChannelActivityPubUrl(videoChannel))
+  const videoChannel = VideoChannelModel.build(videoChannelData)
 
   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
 }
 
-async function fetchVideoChannelByHostAndUUID (serverHost: string, uuid: string, t: Sequelize.Transaction) {
-  try {
-    const videoChannel = await db.VideoChannel.loadByHostAndUUID(serverHost, uuid, t)
-    if (!videoChannel) throw new Error('Video channel not found')
-
-    return videoChannel
-  } catch (err) {
-    logger.error('Cannot load video channel from host and uuid.', { error: err.stack, serverHost, uuid })
-    throw err
-  }
-}
-
 // ---------------------------------------------------------------------------
 
 export {
-  createVideoChannel,
-  fetchVideoChannelByHostAndUUID
+  createVideoChannel
 }