X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Factivitypub%2Foutbox.ts;h=e060affb2aa7af292572f74adc5dff9863280625;hb=e65c0c5b1fab9c3d93f51721b2458cf5cf471f20;hp=01ba253c68972ec298c9b49dfa06988f9690813e;hpb=50d6de9c286abcb34ff4234d56d9cbb803db7665;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts
index 01ba253c6..e060affb2 100644
--- a/server/controllers/activitypub/outbox.ts
+++ b/server/controllers/activitypub/outbox.ts
@@ -1,21 +1,29 @@
 import * as express from 'express'
 import { Activity } from '../../../shared/models/activitypub/activity'
-import { activityPubCollectionPagination } from '../../helpers/activitypub'
-import { pageToStartAndCount } from '../../helpers/core-utils'
-import { ACTIVITY_PUB } from '../../initializers/constants'
-import { announceActivityData, createActivityData } from '../../lib/activitypub/send'
-import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url'
-import { asyncMiddleware, localAccountValidator } from '../../middlewares'
+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 { AccountModel } from '../../models/account/account'
+import { ActorModel } from '../../models/activitypub/actor'
 import { VideoModel } from '../../models/video/video'
+import { activityPubResponse } from './utils'
+import { VideoChannelModel } from '../../models/video/video-channel'
 
 const outboxRouter = express.Router()
 
-outboxRouter.get('/account/:name/outbox',
+outboxRouter.get('/accounts/:name/outbox',
   localAccountValidator,
   asyncMiddleware(outboxController)
 )
 
+outboxRouter.get('/video-channels/:name/outbox',
+  localVideoChannelValidator,
+  asyncMiddleware(outboxController)
+)
+
 // ---------------------------------------------------------------------------
 
 export {
@@ -24,40 +32,47 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountModel = res.locals.account
-  const actor = account.Actor
+async function outboxController (req: express.Request, res: express.Response) {
+  const accountOrVideoChannel: AccountModel | VideoChannelModel = res.locals.account || res.locals.videoChannel
+  const actor = accountOrVideoChannel.Actor
+  const actorOutboxUrl = 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[] = []
 
+  // Avoid too many SQL requests
+  const actors = data.data.map(v => v.VideoChannel.Account.Actor)
+  actors.push(actor)
+
   for (const video of data.data) {
-    const videoObject = video.toActivityPubObject()
+    const byActor = video.VideoChannel.Account.Actor
+    const createActivityAudience = buildAudience([ byActor.followersUrl ], video.privacy === VideoPrivacy.PUBLIC)
 
-    const videoChannel = video.VideoChannel
     // This is a shared video
     if (video.VideoShares !== undefined && video.VideoShares.length !== 0) {
-      const createActivity = await createActivityData(video.url, videoChannel.Account.Actor, videoObject, undefined)
-
-      const url = getAnnounceActivityPubUrl(video.url, actor)
-      const announceActivity = await announceActivityData(url, actor, createActivity, undefined)
+      const videoShare = video.VideoShares[0]
+      const announceActivity = buildAnnounceActivity(videoShare.url, actor, video.url, createActivityAudience)
 
       activities.push(announceActivity)
     } else {
-      const createActivity = await createActivityData(video.url, videoChannel.Account.Actor, videoObject, undefined)
+      const videoObject = video.toActivityPubObject()
+      const createActivity = buildCreateActivity(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()
 }