Misc cleanup

[github/Chocobozzz/PeerTube.git] / server / lib / video-channel.ts

diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index 459d9d4a8456cf7bb7b3dc8a56137cb475949b9d..beb01da9b7d7847789bb632935851acc445e6835 100644 (file)
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -1,10 +1,8 @@
 import * as Sequelize from 'sequelize'
-
+import { VideoChannelCreate } from '../../shared/models'
 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 { getVideoChannelActivityPubUrl } from './activitypub/url'
 
 async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountInstance, t: Sequelize.Transaction) {
   const videoChannelData = {
@@ -15,6 +13,8 @@ async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account
   }
 
   const videoChannel = db.VideoChannel.build(videoChannelData)
+  videoChannel.set('url', getVideoChannelActivityPubUrl(videoChannel))
+
   const options = { transaction: t }
 
   const videoChannelCreated = await videoChannel.save(options)
@@ -22,26 +22,12 @@ async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account
   // Do not forget to add Account information to the created video channel
   videoChannelCreated.Account = account
 
-  sendCreateVideoChannel(videoChannelCreated, t)
-
+  // No need to seed this empty video channel to followers
   return videoChannelCreated
 }
 
-async function fetchVideoChannelByHostAndUUID (podHost: string, uuid: string, t: Sequelize.Transaction) {
-  try {
-    const videoChannel = await db.VideoChannel.loadByHostAndUUID(podHost, 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 })
-    throw err
-  }
-}
-
 // ---------------------------------------------------------------------------
 
 export {
-  createVideoChannel,
-  fetchVideoChannelByHostAndUUID
+  createVideoChannel
 }