X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo-channel.ts;h=49bdf4869d506ba9de3f18eee66af44761e14705;hb=aaedadd5386b580e9ebac540201399c25c7f0b0f;hp=41eab456bb7491e560c25297be3d443978516ead;hpb=8c559fad1e1c4c2ab7f1388c73200aa4c6256d74;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts index 41eab456b..49bdf4869 100644 --- 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 = MChannelDefault & - { Account?: T } +type CustomVideoChannelModelAccount = MChannelDefault & { Account?: T } async function createLocalVideoChannel ( videoChannelInfo: VideoChannelCreate, @@ -15,7 +16,7 @@ async function createLocalVideoChannel ( t: Sequelize.Transaction ): Promise> { 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 })