diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2018-07-21 23:00:25 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-07-24 14:08:44 +0200 |
commit | 3f6d68d9671ddb7ba1c4f3a35021b84856dafb6a (patch) | |
tree | 4a84a6a532fa042710c88edbaa5a5613173e00e3 /server/controllers/activitypub | |
parent | 4278710d5b48546709720fac46657b84bba52a18 (diff) | |
download | PeerTube-3f6d68d9671ddb7ba1c4f3a35021b84856dafb6a.tar.gz PeerTube-3f6d68d9671ddb7ba1c4f3a35021b84856dafb6a.tar.zst PeerTube-3f6d68d9671ddb7ba1c4f3a35021b84856dafb6a.zip |
adding initial support for nodeinfo
Diffstat (limited to 'server/controllers/activitypub')
-rw-r--r-- | server/controllers/activitypub/client.ts | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 3e6361906..ebb2c06a2 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts | |||
@@ -16,7 +16,7 @@ import { VideoModel } from '../../models/video/video' | |||
16 | import { VideoChannelModel } from '../../models/video/video-channel' | 16 | import { VideoChannelModel } from '../../models/video/video-channel' |
17 | import { VideoCommentModel } from '../../models/video/video-comment' | 17 | import { VideoCommentModel } from '../../models/video/video-comment' |
18 | import { VideoShareModel } from '../../models/video/video-share' | 18 | import { VideoShareModel } from '../../models/video/video-share' |
19 | import { cacheRoute } from '../../middlewares/cache' | 19 | import { cache } from '../../middlewares/cache' |
20 | import { activityPubResponse } from './utils' | 20 | import { activityPubResponse } from './utils' |
21 | import { AccountVideoRateModel } from '../../models/account/account-video-rate' | 21 | import { AccountVideoRateModel } from '../../models/account/account-video-rate' |
22 | import { | 22 | import { |
@@ -25,7 +25,6 @@ import { | |||
25 | getVideoLikesActivityPubUrl, | 25 | getVideoLikesActivityPubUrl, |
26 | getVideoSharesActivityPubUrl | 26 | getVideoSharesActivityPubUrl |
27 | } from '../../lib/activitypub' | 27 | } from '../../lib/activitypub' |
28 | import { VideoCaption } from '../../../shared/models/videos/video-caption.model' | ||
29 | import { VideoCaptionModel } from '../../models/video/video-caption' | 28 | import { VideoCaptionModel } from '../../models/video/video-caption' |
30 | 29 | ||
31 | const activityPubClientRouter = express.Router() | 30 | const activityPubClientRouter = express.Router() |
@@ -44,7 +43,7 @@ activityPubClientRouter.get('/accounts?/:name/following', | |||
44 | ) | 43 | ) |
45 | 44 | ||
46 | activityPubClientRouter.get('/videos/watch/:id', | 45 | activityPubClientRouter.get('/videos/watch/:id', |
47 | executeIfActivityPub(asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS))), | 46 | executeIfActivityPub(asyncMiddleware(cache(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS))), |
48 | executeIfActivityPub(asyncMiddleware(videosGetValidator)), | 47 | executeIfActivityPub(asyncMiddleware(videosGetValidator)), |
49 | executeIfActivityPub(asyncMiddleware(videoController)) | 48 | executeIfActivityPub(asyncMiddleware(videoController)) |
50 | ) | 49 | ) |