diff options
Diffstat (limited to 'server/controllers/activitypub/outbox.ts')
-rw-r--r-- | server/controllers/activitypub/outbox.ts | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts index c9e087a13..97bf9b052 100644 --- a/server/controllers/activitypub/outbox.ts +++ b/server/controllers/activitypub/outbox.ts | |||
@@ -1,16 +1,15 @@ | |||
1 | import * as express from 'express' | 1 | import * as express from 'express' |
2 | import { Activity } from '../../../shared/models/activitypub/activity' | 2 | import { Activity } from '../../../shared/models/activitypub/activity' |
3 | import { VideoPrivacy } from '../../../shared/models/videos' | 3 | import { VideoPrivacy } from '../../../shared/models/videos' |
4 | import { activityPubCollectionPagination } from '../../helpers/activitypub' | 4 | import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub' |
5 | import { pageToStartAndCount } from '../../helpers/core-utils' | ||
6 | import { logger } from '../../helpers/logger' | 5 | import { logger } from '../../helpers/logger' |
7 | import { ACTIVITY_PUB } from '../../initializers/constants' | ||
8 | import { announceActivityData, createActivityData } from '../../lib/activitypub/send' | 6 | import { announceActivityData, createActivityData } from '../../lib/activitypub/send' |
9 | import { buildAudience } from '../../lib/activitypub/audience' | 7 | import { buildAudience } from '../../lib/activitypub/audience' |
10 | import { asyncMiddleware, localAccountValidator } from '../../middlewares' | 8 | import { asyncMiddleware, localAccountValidator } from '../../middlewares' |
11 | import { AccountModel } from '../../models/account/account' | 9 | import { AccountModel } from '../../models/account/account' |
12 | import { ActorModel } from '../../models/activitypub/actor' | 10 | import { ActorModel } from '../../models/activitypub/actor' |
13 | import { VideoModel } from '../../models/video/video' | 11 | import { VideoModel } from '../../models/video/video' |
12 | import { activityPubResponse } from './utils' | ||
14 | 13 | ||
15 | const outboxRouter = express.Router() | 14 | const outboxRouter = express.Router() |
16 | 15 | ||
@@ -30,10 +29,17 @@ export { | |||
30 | async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) { | 29 | async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) { |
31 | const account: AccountModel = res.locals.account | 30 | const account: AccountModel = res.locals.account |
32 | const actor = account.Actor | 31 | const actor = account.Actor |
32 | const actorOutboxUrl = account.Actor.url + '/outbox' | ||
33 | |||
34 | logger.info('Receiving outbox request for %s.', actorOutboxUrl) | ||
33 | 35 | ||
34 | const page = req.query.page || 1 | 36 | const handler = (start: number, count: number) => buildActivities(actor, start, count) |
35 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) | 37 | const json = await activityPubCollectionPagination(actorOutboxUrl, handler, req.query.page) |
38 | |||
39 | return activityPubResponse(activityPubContextify(json), res) | ||
40 | } | ||
36 | 41 | ||
42 | async function buildActivities (actor: ActorModel, start: number, count: number) { | ||
37 | const data = await VideoModel.listAllAndSharedByActorForOutbox(actor.id, start, count) | 43 | const data = await VideoModel.listAllAndSharedByActorForOutbox(actor.id, start, count) |
38 | const activities: Activity[] = [] | 44 | const activities: Activity[] = [] |
39 | 45 | ||
@@ -62,14 +68,8 @@ async function outboxController (req: express.Request, res: express.Response, ne | |||
62 | } | 68 | } |
63 | } | 69 | } |
64 | 70 | ||
65 | const newResult = { | 71 | return { |
66 | data: activities, | 72 | data: activities, |
67 | total: data.total | 73 | total: data.total |
68 | } | 74 | } |
69 | const actorOutboxUrl = account.Actor.url + '/outbox' | ||
70 | const json = activityPubCollectionPagination(actorOutboxUrl, page, newResult) | ||
71 | |||
72 | logger.info('Receiving outbox request for %s.', actorOutboxUrl) | ||
73 | |||
74 | return res.json(json).end() | ||
75 | } | 75 | } |