X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-create.ts;fp=server%2Flib%2Factivitypub%2Fprocess-create.ts;h=aac941a6c9bf644f620ea5cfc5fc9c848e57cfe3;hb=54141398354e6e7b94aa3065a705a1251390111c;hp=de8e09adf61d98c6f840bb34b9761c944a446894;hpb=eb8b27c93e61a896a08923dc1ca3c87ba8cf4948;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/process-create.ts b/server/lib/activitypub/process/process-create.ts similarity index 85% rename from server/lib/activitypub/process-create.ts rename to server/lib/activitypub/process/process-create.ts index de8e09adf..aac941a6c 100644 --- a/server/lib/activitypub/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -1,9 +1,9 @@ -import { ActivityCreate, VideoChannelObject } from '../../../shared' -import { VideoAbuseObject } from '../../../shared/models/activitypub/objects/video-abuse-object' -import { logger, retryTransactionWrapper } from '../../helpers' -import { getActivityPubUrl, getOrCreateAccount } from '../../helpers/activitypub' -import { database as db } from '../../initializers' -import { AccountInstance } from '../../models/account/account-interface' +import { ActivityCreate, VideoChannelObject } from '../../../../shared' +import { VideoAbuseObject } from '../../../../shared/models/activitypub/objects/video-abuse-object' +import { logger, retryTransactionWrapper } from '../../../helpers' +import { getOrCreateAccount, getVideoChannelActivityPubUrl } from '../../../helpers/activitypub' +import { database as db } from '../../../initializers' +import { AccountInstance } from '../../../models/account/account-interface' import { videoChannelActivityObjectToDBAttributes } from './misc' async function processCreateActivity (activity: ActivityCreate) { @@ -47,7 +47,7 @@ function addRemoteVideoChannel (account: AccountInstance, videoChannelToCreateDa const videoChannelData = videoChannelActivityObjectToDBAttributes(videoChannelToCreateData, account) videoChannel = db.VideoChannel.build(videoChannelData) - videoChannel.url = getActivityPubUrl('videoChannel', videoChannel.uuid) + videoChannel.url = getVideoChannelActivityPubUrl(videoChannel) videoChannel = await videoChannel.save({ transaction: t }) logger.info('Remote video channel with uuid %s inserted.', videoChannelToCreateData.uuid)