2 files changed, 28 insertions, 3 deletions

diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index 76049f496..7b3921770 100644
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -4,10 +4,13 @@ import * as express from 'express'
 import { database as db } from '../../initializers'
 import { executeIfActivityPub, localAccountValidator } from '../../middlewares'
 import { pageToStartAndCount } from '../../helpers'
-import { AccountInstance } from '../../models'
+import { AccountInstance, VideoChannelInstance } from '../../models'
 import { activityPubCollectionPagination } from '../../helpers/activitypub'
 import { ACTIVITY_PUB } from '../../initializers/constants'
 import { asyncMiddleware } from '../../middlewares/async'
+import { videosGetValidator } from '../../middlewares/validators/videos'
+import { VideoInstance } from '../../models/video/video-interface'
+import { videoChannelsGetValidator } from '../../middlewares/validators/video-channels'
 
 const activityPubClientRouter = express.Router()
 
@@ -26,6 +29,16 @@ activityPubClientRouter.get('/account/:name/following',
   executeIfActivityPub(asyncMiddleware(accountFollowingController))
 )
 
+activityPubClientRouter.get('/videos/watch/:id',
+  executeIfActivityPub(videosGetValidator),
+  executeIfActivityPub(asyncMiddleware(videoController))
+)
+
+activityPubClientRouter.get('/video-channels/:id',
+  executeIfActivityPub(videoChannelsGetValidator),
+  executeIfActivityPub(asyncMiddleware(videoChannelController))
+)
+
 // ---------------------------------------------------------------------------
 
 export {
@@ -63,3 +76,15 @@ async function accountFollowingController (req: express.Request, res: express.Re
 
   return res.json(activityPubResult)
 }
+
+async function videoController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const video: VideoInstance = res.locals.video
+
+  return res.json(video.toActivityPubObject())
+}
+
+async function videoChannelController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const videoChannel: VideoChannelInstance = res.locals.videoChannel
+
+  return res.json(videoChannel.toActivityPubObject())
+}
diff --git a/server/controllers/api/videos/channel.ts b/server/controllers/api/videos/channel.ts
index 656bc3129..8f3df2550 100644
--- a/server/controllers/api/videos/channel.ts
+++ b/server/controllers/api/videos/channel.ts
@@ -10,7 +10,7 @@ import {
   paginationValidator,
   setPagination,
   setVideoChannelsSort,
-  videoChannelGetValidator,
+  videoChannelsGetValidator,
   videoChannelsAddValidator,
   videoChannelsRemoveValidator,
   videoChannelsSortValidator,
@@ -53,7 +53,7 @@ videoChannelRouter.delete('/channels/:id',
 )
 
 videoChannelRouter.get('/channels/:id',
-  videoChannelGetValidator,
+  videoChannelsGetValidator,
   asyncMiddleware(getVideoChannel)
 )