-import * as express from 'express'
+import express from 'express'
+import { activityPubCollectionPagination } from '@server/lib/activitypub/collection'
+import { activityPubContextify } from '@server/lib/activitypub/context'
+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/typings/models'
const outboxRouter = express.Router()
outboxRouter.get('/accounts/:name/outbox',
+ apPaginationValidator,
localAccountValidator,
asyncMiddleware(outboxController)
)
-outboxRouter.get('/video-channels/:name/outbox',
- localVideoChannelValidator,
+outboxRouter.get('/video-channels/:nameWithHost/outbox',
+ apPaginationValidator,
+ asyncMiddleware(videoChannelsNameWithHostValidator),
+ ensureIsLocalChannel,
asyncMiddleware(outboxController)
)
logger.info('Receiving outbox request for %s.', actorOutboxUrl)
const handler = (start: number, count: number) => buildActivities(actor, start, count)
- const json = await activityPubCollectionPagination(actorOutboxUrl, handler, req.query.page)
+ const json = await activityPubCollectionPagination(actorOutboxUrl, handler, req.query.page, req.query.size)
- return activityPubResponse(activityPubContextify(json), res)
+ return activityPubResponse(activityPubContextify(json, 'Collection'), res)
}
async function buildActivities (actor: MActorLight, start: number, count: number) {