aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-06-11 14:50:01 +0200
committerChocobozzz <me@florianbigard.com>2021-06-11 14:50:01 +0200
commit559985b51c087f6289694580ec19bcd3eeb0b2fc (patch)
tree3af603e7fff0aa9fdc30621b104ad0260d13c27d /server/controllers
parent69322042c4da7dddfdccf55efa3cfbf408660d06 (diff)
downloadPeerTube-559985b51c087f6289694580ec19bcd3eeb0b2fc.tar.gz
PeerTube-559985b51c087f6289694580ec19bcd3eeb0b2fc.tar.zst
PeerTube-559985b51c087f6289694580ec19bcd3eeb0b2fc.zip
Also serve AP for new account/video watch pages
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/activitypub/client.ts7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index f592af644..bf8e3160b 100644
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -43,7 +43,7 @@ activityPubClientRouter.use(cors())
43// Intercept ActivityPub client requests 43// Intercept ActivityPub client requests
44 44
45activityPubClientRouter.get( 45activityPubClientRouter.get(
46 [ '/accounts?/:name', '/accounts?/:name/video-channels' ], 46 [ '/accounts?/:name', '/accounts?/:name/video-channels', '/a/:name', '/a/:name/video-channels' ],
47 executeIfActivityPub, 47 executeIfActivityPub,
48 asyncMiddleware(localAccountValidator), 48 asyncMiddleware(localAccountValidator),
49 accountController 49 accountController
@@ -74,7 +74,8 @@ activityPubClientRouter.get('/accounts?/:name/dislikes/:videoId',
74 getAccountVideoRateFactory('dislike') 74 getAccountVideoRateFactory('dislike')
75) 75)
76 76
77activityPubClientRouter.get('/videos/watch/:id', 77activityPubClientRouter.get(
78 [ '/videos/watch/:id', '/w/:id' ],
78 executeIfActivityPub, 79 executeIfActivityPub,
79 asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS)), 80 asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS)),
80 asyncMiddleware(videosCustomGetValidator('all')), 81 asyncMiddleware(videosCustomGetValidator('all')),
@@ -122,7 +123,7 @@ activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId/activity
122) 123)
123 124
124activityPubClientRouter.get( 125activityPubClientRouter.get(
125 [ '/video-channels/:name', '/video-channels/:name/videos' ], 126 [ '/video-channels/:name', '/video-channels/:name/videos', '/c/:name', '/c/:name/videos' ],
126 executeIfActivityPub, 127 executeIfActivityPub,
127 asyncMiddleware(localVideoChannelValidator), 128 asyncMiddleware(localVideoChannelValidator),
128 videoChannelController 129 videoChannelController