X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo-channel.ts;h=c9887c667cea959105df88c5a7976bf581e7fd96;hb=76314386aeafdd6849b7b70c517779d6b2013473;hp=2241799737b8c80d97be7d44e4a0f2df4e9c8b07;hpb=72c7248b6fdcdb2175e726ff51b42e7555f2bd84;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index 224179973..c9887c667 100644
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -1,42 +1,58 @@
 import * as Sequelize from 'sequelize'
-
-import { addVideoChannelToFriends } from './friends'
-import { database as db } from '../initializers'
-import { AuthorInstance } from '../models'
+import { v4 as uuidv4 } from 'uuid'
 import { VideoChannelCreate } from '../../shared/models'
+import { VideoChannelModel } from '../models/video/video-channel'
+import { buildActorInstance, federateVideoIfNeeded, getVideoChannelActivityPubUrl } from './activitypub'
+import { VideoModel } from '../models/video/video'
+import { MAccountId, MChannelDefault, MChannelId } from '../typings/models'
+
+type CustomVideoChannelModelAccount <T extends MAccountId> = MChannelDefault & { Account?: T }
+
+async function createLocalVideoChannel <T extends MAccountId> (
+  videoChannelInfo: VideoChannelCreate,
+  account: T,
+  t: Sequelize.Transaction
+): Promise<CustomVideoChannelModelAccount<T>> {
+  const uuid = uuidv4()
+  const url = getVideoChannelActivityPubUrl(videoChannelInfo.name)
+  const actorInstance = buildActorInstance('Group', url, videoChannelInfo.name, uuid)
 
-function createVideoChannel (videoChannelInfo: VideoChannelCreate, author: AuthorInstance, t: Sequelize.Transaction) {
-  let videoChannelUUID = ''
+  const actorInstanceCreated = await actorInstance.save({ transaction: t })
 
   const videoChannelData = {
-    name: videoChannelInfo.name,
+    name: videoChannelInfo.displayName,
     description: videoChannelInfo.description,
-    remote: false,
-    authorId: author.id
+    support: videoChannelInfo.support,
+    accountId: account.id,
+    actorId: actorInstanceCreated.id
   }
 
-  const videoChannel = db.VideoChannel.build(videoChannelData)
+  const videoChannel = new VideoChannelModel(videoChannelData)
+
   const options = { transaction: t }
+  const videoChannelCreated: CustomVideoChannelModelAccount<T> = await videoChannel.save(options) as MChannelDefault
+
+  // Do not forget to add Account/Actor information to the created video channel
+  videoChannelCreated.Account = account
+  videoChannelCreated.Actor = actorInstanceCreated
 
-  return videoChannel.save(options)
-    .then(videoChannelCreated => {
-      // Do not forget to add Author information to the created video channel
-      videoChannelCreated.Author = author
-      videoChannelUUID = videoChannelCreated.uuid
-
-      return videoChannelCreated
-    })
-    .then(videoChannel => {
-      const remoteVideoChannel = videoChannel.toAddRemoteJSON()
-
-      // Now we'll add the video channel's meta data to our friends
-      return addVideoChannelToFriends(remoteVideoChannel, t)
-    })
-    .then(() => videoChannelUUID) // Return video channel UUID
+  // No need to seed this empty video channel to followers
+  return videoChannelCreated
+}
+
+async function federateAllVideosOfChannel (videoChannel: MChannelId) {
+  const videoIds = await VideoModel.getAllIdsFromChannel(videoChannel)
+
+  for (const videoId of videoIds) {
+    const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
+
+    await federateVideoIfNeeded(video, false)
+  }
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  createVideoChannel
+  createLocalVideoChannel,
+  federateAllVideosOfChannel
 }