Add ability to embed a video in Twitter

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

diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index 2587ee212aa758cfc2f3d9ecc6c9b6732a7a8ec8..f5ac9c4661904de8247afe26450e6ab1f54cafa0 100644 (file)
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -4,8 +4,9 @@ import { VideoPrivacy } from '../../../shared/models/videos'
 import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub'
 import { pageToStartAndCount } from '../../helpers/core-utils'
 import { ACTIVITY_PUB, CONFIG } from '../../initializers'
-import { buildVideoAnnounceToFollowers } from '../../lib/activitypub/send'
+import { buildVideoAnnounce } 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,14 +37,38 @@ 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))
+)
 activityPubClientRouter.get('/videos/watch/:id/announces/:accountId',
   executeIfActivityPub(asyncMiddleware(videosShareValidator)),
   executeIfActivityPub(asyncMiddleware(videoAnnounceController))
 )
+activityPubClientRouter.get('/videos/watch/:id/likes',
+  executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+  executeIfActivityPub(asyncMiddleware(videoLikesController))
+)
+activityPubClientRouter.get('/videos/watch/:id/dislikes',
+  executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+  executeIfActivityPub(asyncMiddleware(videoDislikesController))
+)
+activityPubClientRouter.get('/videos/watch/:id/comments',
+  executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+  executeIfActivityPub(asyncMiddleware(videoCommentsController))
+)
 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)),
@@ -69,22 +94,21 @@ export {
 function accountController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const account: AccountModel = res.locals.account
 
-  return res.json(activityPubContextify(account.toActivityPubObject()))
-    .end()
+  return activityPubResponse(activityPubContextify(account.toActivityPubObject()), res)
 }
 
 async function accountFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const account: AccountModel = res.locals.account
   const activityPubResult = await actorFollowers(req, account.Actor)
 
-  return res.json(activityPubContextify(activityPubResult))
+  return activityPubResponse(activityPubContextify(activityPubResult), res)
 }
 
 async function accountFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const account: AccountModel = res.locals.account
   const activityPubResult = await actorFollowing(req, account.Actor)
 
-  return res.json(activityPubContextify(activityPubResult))
+  return activityPubResponse(activityPubContextify(activityPubResult), res)
 }
 
 async function videoController (req: express.Request, res: express.Response, next: express.NextFunction) {
@@ -95,34 +119,79 @@ 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)
 
-  return res.json(activityPubContextify(videoObject))
+  if (req.path.endsWith('/activity')) {
+    const data = await createActivityData(video.url, video.VideoChannel.Account.Actor, videoObject, undefined, audience)
+    return activityPubResponse(activityPubContextify(data), res)
+  }
+
+  return activityPubResponse(activityPubContextify(videoObject), res)
 }
 
 async function videoAnnounceController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const share = res.locals.videoShare as VideoShareModel
-  const object = await buildVideoAnnounceToFollowers(share.Actor, res.locals.video, undefined)
+  const object = await buildVideoAnnounce(share.Actor, share, res.locals.video, undefined)
+
+  return activityPubResponse(activityPubContextify(object), res)
+}
+
+async function videoAnnouncesController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const video: VideoModel = res.locals.video
+
+  // We need more attributes
+  const videoAll = await VideoModel.loadAndPopulateAll(video.id)
+  const object = videoAll.toAnnouncesActivityPubObject()
+
+  return activityPubResponse(activityPubContextify(object), res)
+}
+
+async function videoLikesController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const video: VideoModel = res.locals.video
+
+  // We need more attributes
+  const videoAll = await VideoModel.loadAndPopulateAll(video.id)
+  const { likesObject } = videoAll.toRatesActivityPubObjects()
+
+  return activityPubResponse(activityPubContextify(likesObject), res)
+}
+
+async function videoDislikesController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const video: VideoModel = res.locals.video
+
+  // We need more attributes
+  const videoAll = await VideoModel.loadAndPopulateAll(video.id)
+  const { dislikesObject } = videoAll.toRatesActivityPubObjects()
+
+  return activityPubResponse(activityPubContextify(dislikesObject), res)
+}
+
+async function videoCommentsController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const video: VideoModel = res.locals.video
+
+  // We need more attributes
+  const videoAll = await VideoModel.loadAndPopulateAll(video.id)
+  const commentsObject = videoAll.toCommentsActivityPubObject()
 
-  return res.json(activityPubContextify(object))
+  return activityPubResponse(activityPubContextify(commentsObject), res)
 }
 
 async function videoChannelController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const videoChannel: VideoChannelModel = res.locals.videoChannel
 
-  return res.json(activityPubContextify(videoChannel.toActivityPubObject()))
+  return activityPubResponse(activityPubContextify(videoChannel.toActivityPubObject()), res)
 }
 
 async function videoChannelFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const videoChannel: VideoChannelModel = res.locals.videoChannel
   const activityPubResult = await actorFollowers(req, videoChannel.Actor)
 
-  return res.json(activityPubContextify(activityPubResult))
+  return activityPubResponse(activityPubContextify(activityPubResult), res)
 }
 
 async function videoChannelFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const videoChannel: VideoChannelModel = res.locals.videoChannel
   const activityPubResult = await actorFollowing(req, videoChannel.Actor)
 
-  return res.json(activityPubContextify(activityPubResult))
+  return activityPubResponse(activityPubContextify(activityPubResult), res)
 }
 
 async function videoCommentController (req: express.Request, res: express.Response, next: express.NextFunction) {
@@ -134,7 +203,12 @@ async function videoCommentController (req: express.Request, res: express.Respon
 
   const videoCommentObject = audiencify(videoComment.toActivityPubObject(threadParentComments), audience)
 
-  return res.json(activityPubContextify(videoCommentObject))
+  if (req.path.endsWith('/activity')) {
+    const data = await createActivityData(videoComment.url, videoComment.Account.Actor, videoCommentObject, undefined, audience)
+    return activityPubResponse(activityPubContextify(data), res)
+  }
+
+  return activityPubResponse(activityPubContextify(videoCommentObject), res)
 }
 
 // ---------------------------------------------------------------------------
@@ -154,3 +228,9 @@ async function actorFollowers (req: express.Request, actor: ActorModel) {
   const result = await ActorFollowModel.listAcceptedFollowerUrlsForApi([ actor.id ], undefined, start, count)
   return activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result)
 }
+
+function activityPubResponse (data: any, res: express.Response) {
+  return res.type('application/activity+json; charset=utf-8')
+    .json(data)
+    .end()
+}