X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo-channel.ts;h=80303fb838c62320daca6f5244517e49bd57cb74;hb=608624252466acf9f1d9ee1c1170bd4fe4d18d18;hp=f81383ce86340dbdc095eca1b0a53e646a063b20;hpb=38fa2065831b5f55be0d7f30f19a62c967397208;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index f81383ce8..80303fb83 100644
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -1,10 +1,11 @@
 import * as Sequelize from 'sequelize'
 
-import { addVideoChannelToFriends } from './friends'
 import { database as db } from '../initializers'
 import { logger } from '../helpers'
 import { AccountInstance } from '../models'
 import { VideoChannelCreate } from '../../shared/models'
+import { sendCreateVideoChannel } from './activitypub/send-request'
+import { getActivityPubUrl } from '../helpers/activitypub'
 
 async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountInstance, t: Sequelize.Transaction) {
   const videoChannelData = {
@@ -15,6 +16,8 @@ async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account
   }
 
   const videoChannel = db.VideoChannel.build(videoChannelData)
+  videoChannel.set('url', getActivityPubUrl('videoChannel', videoChannel.uuid))
+
   const options = { transaction: t }
 
   const videoChannelCreated = await videoChannel.save(options)
@@ -22,22 +25,19 @@ async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account
   // Do not forget to add Account information to the created video channel
   videoChannelCreated.Account = account
 
-  const remoteVideoChannel = videoChannelCreated.toAddRemoteJSON()
-
-  // Now we'll add the video channel's meta data to our friends
-  await addVideoChannelToFriends(remoteVideoChannel, t)
+  sendCreateVideoChannel(videoChannelCreated, t)
 
   return videoChannelCreated
 }
 
-async function fetchVideoChannelByHostAndUUID (podHost: string, uuid: string, t: Sequelize.Transaction) {
+async function fetchVideoChannelByHostAndUUID (serverHost: string, uuid: string, t: Sequelize.Transaction) {
   try {
-    const videoChannel = await db.VideoChannel.loadByHostAndUUID(podHost, uuid, t)
+    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, podHost, uuid })
+    logger.error('Cannot load video channel from host and uuid.', { error: err.stack, serverHost, uuid })
     throw err
   }
 }