Fix federation with some actors

[github/Chocobozzz/PeerTube.git] / server / controllers / activitypub / outbox.ts

diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts
index 5a2d43f3dd8b803dba2d6efe11ad66768d4b17c6..f3dd2ad7d3e5fed8e1be89003813054cde20a24b 100644 (file)
--- a/server/controllers/activitypub/outbox.ts
+++ b/server/controllers/activitypub/outbox.ts
@@ -1,22 +1,27 @@
 import * as express from 'express'
 import { Activity } from '../../../shared/models/activitypub/activity'
-import { activityPubCollectionPagination } from '../../helpers/activitypub'
-import { pageToStartAndCount } from '../../helpers/core-utils'
-import { database as db } from '../../initializers'
-import { ACTIVITY_PUB } from '../../initializers/constants'
-import { addActivityData } from '../../lib/activitypub/send/send-add'
-import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url'
-import { announceActivityData } from '../../lib/index'
-import { asyncMiddleware, localAccountValidator } from '../../middlewares'
-import { AccountInstance } from '../../models/account/account-interface'
+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 { VideoModel } from '../../models/video/video'
+import { activityPubResponse } from './utils'
+import { MActorLight } from '@server/typings/models'
 
 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 {
@@ -25,39 +30,43 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountInstance = res.locals.account
+async function outboxController (req: express.Request, res: express.Response) {
+  const accountOrVideoChannel = res.locals.account || res.locals.videoChannel
+  const actor = accountOrVideoChannel.Actor
+  const actorOutboxUrl = actor.url + '/outbox'
+
+  logger.info('Receiving outbox request for %s.', actorOutboxUrl)
 
-  const page = req.query.page || 1
-  const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
+  const handler = (start: number, count: number) => buildActivities(actor, start, count)
+  const json = await activityPubCollectionPagination(actorOutboxUrl, handler, req.query.page)
 
-  const data = await db.Video.listAllAndSharedByAccountForOutbox(account.id, start, count)
+  return activityPubResponse(activityPubContextify(json), res)
+}
+
+async function buildActivities (actor: MActorLight, start: number, count: number) {
+  const data = await VideoModel.listAllAndSharedByActorForOutbox(actor.id, start, count)
   const activities: Activity[] = []
 
   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)
 
     // This is a shared video
-    const videoChannel = video.VideoChannel
     if (video.VideoShares !== undefined && video.VideoShares.length !== 0) {
-      const addActivity = await addActivityData(video.url, videoChannel.Account, video, videoChannel.url, videoObject, undefined)
-
-      const url = getAnnounceActivityPubUrl(video.url, account)
-      const announceActivity = await announceActivityData(url, account, addActivity, undefined)
+      const videoShare = video.VideoShares[0]
+      const announceActivity = buildAnnounceActivity(videoShare.url, actor, video.url, createActivityAudience)
 
       activities.push(announceActivity)
     } else {
-      const addActivity = await addActivityData(video.url, account, video, videoChannel.url, videoObject, undefined)
+      const videoObject = video.toActivityPubObject()
+      const createActivity = buildCreateActivity(video.url, byActor, videoObject, createActivityAudience)
 
-      activities.push(addActivity)
+      activities.push(createActivity)
     }
   }
 
-  const newResult = {
+  return {
     data: activities,
     total: data.total
   }
-  const json = activityPubCollectionPagination(account.url + '/outbox', page, newResult)
-
-  return res.json(json).end()
 }