X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Factivitypub%2Foutbox.ts;h=cdef8e9699b495825b5e80cbac60f2272abb939f;hb=a37e9e74ff07b057370d1ed6c0b391a02be8a6d2;hp=bdf9d138bfd6f035e88bd50eea5ef2a5e485cbb2;hpb=11e520b50d791a0dd48cbb2d0fc681b25eb7cd53;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts index bdf9d138b..cdef8e969 100644 --- a/server/controllers/activitypub/outbox.ts +++ b/server/controllers/activitypub/outbox.ts @@ -1,15 +1,15 @@ import express from 'express' +import { MActorLight } from '@server/types/models' import { Activity } from '../../../shared/models/activitypub/activity' import { VideoPrivacy } from '../../../shared/models/videos' import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub' import { logger } from '../../helpers/logger' -import { buildAnnounceActivity, buildCreateActivity } from '../../lib/activitypub/send' import { buildAudience } from '../../lib/activitypub/audience' -import { asyncMiddleware, localAccountValidator, localVideoChannelValidator } from '../../middlewares' +import { buildAnnounceActivity, buildCreateActivity } from '../../lib/activitypub/send' +import { asyncMiddleware, ensureIsLocalChannel, localAccountValidator, videoChannelsNameWithHostValidator } from '../../middlewares' +import { apPaginationValidator } from '../../middlewares/validators/activitypub' import { VideoModel } from '../../models/video/video' import { activityPubResponse } from './utils' -import { MActorLight } from '@server/types/models' -import { apPaginationValidator } from '../../middlewares/validators/activitypub' const outboxRouter = express.Router() @@ -19,9 +19,10 @@ outboxRouter.get('/accounts/:name/outbox', asyncMiddleware(outboxController) ) -outboxRouter.get('/video-channels/:name/outbox', +outboxRouter.get('/video-channels/:nameWithHost/outbox', apPaginationValidator, - localVideoChannelValidator, + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, asyncMiddleware(outboxController) )