import * as express from 'express'
import { Activity } from '../../../shared/models/activitypub/activity'
import { VideoPrivacy } from '../../../shared/models/videos'
-import { activityPubCollectionPagination } from '../../helpers/activitypub'
-import { pageToStartAndCount } from '../../helpers/core-utils'
-import { ACTIVITY_PUB } from '../../initializers/constants'
+import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub'
+import { logger } from '../../helpers/logger'
import { announceActivityData, createActivityData } from '../../lib/activitypub/send'
-import { buildAudience } from '../../lib/activitypub/send/misc'
+import { buildAudience } from '../../lib/activitypub/audience'
import { asyncMiddleware, localAccountValidator } from '../../middlewares'
import { AccountModel } from '../../models/account/account'
import { ActorModel } from '../../models/activitypub/actor'
import { VideoModel } from '../../models/video/video'
+import { activityPubResponse } from './utils'
const outboxRouter = express.Router()
async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
const account: AccountModel = res.locals.account
const actor = account.Actor
+ const actorOutboxUrl = account.Actor.url + '/outbox'
- const page = req.query.page || 1
- const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
+ 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)
+
+ return activityPubResponse(activityPubContextify(json), res)
+}
+
+async function buildActivities (actor: ActorModel, start: number, count: number) {
const data = await VideoModel.listAllAndSharedByActorForOutbox(actor.id, start, count)
const activities: Activity[] = []
const actors = data.data.map(v => v.VideoChannel.Account.Actor)
actors.push(actor)
- const followersMatrix = await ActorModel.getActorsFollowerSharedInboxUrls(actors, undefined)
-
for (const video of data.data) {
const byActor = video.VideoChannel.Account.Actor
- const createActivityAudience = buildAudience(followersMatrix[byActor.id], video.privacy === VideoPrivacy.PUBLIC)
+ const createActivityAudience = buildAudience([ byActor.followersUrl ], video.privacy === VideoPrivacy.PUBLIC)
// This is a shared video
if (video.VideoShares !== undefined && video.VideoShares.length !== 0) {
const videoShare = video.VideoShares[0]
- const announceAudience = buildAudience(followersMatrix[actor.id], video.privacy === VideoPrivacy.PUBLIC)
- const announceActivity = await announceActivityData(videoShare.url, actor, video.url, undefined, announceAudience)
+ const announceActivity = announceActivityData(videoShare.url, actor, video.url, createActivityAudience)
activities.push(announceActivity)
} else {
const videoObject = video.toActivityPubObject()
- const createActivity = await createActivityData(video.url, byActor, videoObject, undefined, createActivityAudience)
+ const createActivity = createActivityData(video.url, byActor, videoObject, createActivityAudience)
activities.push(createActivity)
}
}
- const newResult = {
+ return {
data: activities,
total: data.total
}
- const json = activityPubCollectionPagination(account.Actor.url + '/outbox', page, newResult)
-
- return res.json(json).end()
}