From: Chocobozzz <me@florianbigard.com>
Date: Thu, 22 Mar 2018 16:08:02 +0000 (+0100)
Subject: Add activity route to video and video comment objects
X-Git-Tag: v1.0.0-beta.2~61
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=296c090563f9d609d3c55dec378a3a1d65c4bd78;p=oweals%2Fpeertube.git

Add activity route to video and video comment objects
---

diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index 55bd85c48..347079816 100644
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -6,6 +6,7 @@ import { pageToStartAndCount } from '../../helpers/core-utils'
 import { ACTIVITY_PUB, CONFIG } from '../../initializers'
 import { buildVideoAnnounceToFollowers } from '../../lib/activitypub/send'
 import { audiencify, getAudience } from '../../lib/activitypub/send/misc'
+import { createActivityData } from '../../lib/activitypub/send/send-create'
 import { asyncMiddleware, executeIfActivityPub, localAccountValidator } from '../../middlewares'
 import { videoChannelsGetValidator, videosGetValidator, videosShareValidator } from '../../middlewares/validators'
 import { videoCommentGetValidator } from '../../middlewares/validators/video-comments'
@@ -36,6 +37,10 @@ activityPubClientRouter.get('/videos/watch/:id',
   executeIfActivityPub(asyncMiddleware(videosGetValidator)),
   executeIfActivityPub(asyncMiddleware(videoController))
 )
+activityPubClientRouter.get('/videos/watch/:id/activity',
+  executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+  executeIfActivityPub(asyncMiddleware(videoController))
+)
 activityPubClientRouter.get('/videos/watch/:id/announces',
   executeIfActivityPub(asyncMiddleware(videosGetValidator)),
   executeIfActivityPub(asyncMiddleware(videoAnnouncesController))
@@ -60,6 +65,10 @@ activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId',
   executeIfActivityPub(asyncMiddleware(videoCommentGetValidator)),
   executeIfActivityPub(asyncMiddleware(videoCommentController))
 )
+activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId/activity',
+  executeIfActivityPub(asyncMiddleware(videoCommentGetValidator)),
+  executeIfActivityPub(asyncMiddleware(videoCommentController))
+)
 
 activityPubClientRouter.get('/video-channels/:id',
   executeIfActivityPub(asyncMiddleware(videoChannelsGetValidator)),
@@ -111,6 +120,11 @@ async function videoController (req: express.Request, res: express.Response, nex
   const audience = await getAudience(video.VideoChannel.Account.Actor, undefined, video.privacy === VideoPrivacy.PUBLIC)
   const videoObject = audiencify(videoAll.toActivityPubObject(), audience)
 
+  if (req.path.endsWith('/activity')) {
+    const data = await createActivityData(video.url, video.VideoChannel.Account.Actor, videoObject, undefined, audience)
+    return res.json(activityPubContextify(data))
+  }
+
   return res.json(activityPubContextify(videoObject))
 }
 
@@ -190,6 +204,11 @@ async function videoCommentController (req: express.Request, res: express.Respon
 
   const videoCommentObject = audiencify(videoComment.toActivityPubObject(threadParentComments), audience)
 
+  if (req.path.endsWith('/activity')) {
+    const data = await createActivityData(videoComment.url, videoComment.Account.Actor, videoCommentObject, undefined, audience)
+    return res.json(activityPubContextify(data))
+  }
+
   return res.json(activityPubContextify(videoCommentObject))
 }