Fix incorrect IDs in AP federation

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

diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index 41eab456bb7491e560c25297be3d443978516ead..49bdf4869d506ba9de3f18eee66af44761e14705 100644 (file)
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -1,13 +1,14 @@
 import * as Sequelize from 'sequelize'
-import * as uuidv4 from 'uuid/v4'
+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'
+import { VideoChannelModel } from '../models/video/video-channel'
+import { MAccountId, MChannelDefault, MChannelId } from '../types/models'
+import { buildActorInstance } from './activitypub/actor'
+import { getLocalVideoChannelActivityPubUrl } from './activitypub/url'
+import { federateVideoIfNeeded } from './activitypub/videos'
 
-type CustomVideoChannelModelAccount <T extends MAccountId> = MChannelDefault &
-  { Account?: T }
+type CustomVideoChannelModelAccount <T extends MAccountId> = MChannelDefault & { Account?: T }
 
 async function createLocalVideoChannel <T extends MAccountId> (
   videoChannelInfo: VideoChannelCreate,
@@ -15,7 +16,7 @@ async function createLocalVideoChannel <T extends MAccountId> (
   t: Sequelize.Transaction
 ): Promise<CustomVideoChannelModelAccount<T>> {
   const uuid = uuidv4()
-  const url = getVideoChannelActivityPubUrl(videoChannelInfo.name)
+  const url = getLocalVideoChannelActivityPubUrl(videoChannelInfo.name)
   const actorInstance = buildActorInstance('Group', url, videoChannelInfo.name, uuid)
 
   const actorInstanceCreated = await actorInstance.save({ transaction: t })