aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers/static.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-07-24 14:35:11 +0200
committerChocobozzz <me@florianbigard.com>2018-07-24 14:36:25 +0200
commit98d3324db3b1c345fc30e5dbcef3b1e11169867e (patch)
tree789b15539307a3671722ccce71f3b0de1a9dcc8a /server/controllers/static.ts
parent3f6d68d9671ddb7ba1c4f3a35021b84856dafb6a (diff)
downloadPeerTube-98d3324db3b1c345fc30e5dbcef3b1e11169867e.tar.gz
PeerTube-98d3324db3b1c345fc30e5dbcef3b1e11169867e.tar.zst
PeerTube-98d3324db3b1c345fc30e5dbcef3b1e11169867e.zip
Fix nodeinfo endpoint
Diffstat (limited to 'server/controllers/static.ts')
-rw-r--r--server/controllers/static.ts12
1 files changed, 6 insertions, 6 deletions
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index ce5d0c5fa..f10427f3e 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -2,7 +2,7 @@ import * as cors from 'cors'
2import * as express from 'express' 2import * as express from 'express'
3import { CONFIG, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS, ROUTE_CACHE_LIFETIME } from '../initializers' 3import { CONFIG, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS, ROUTE_CACHE_LIFETIME } from '../initializers'
4import { VideosPreviewCache } from '../lib/cache' 4import { VideosPreviewCache } from '../lib/cache'
5import { cache } from '../middlewares/cache' 5import { cacheRoute } from '../middlewares/cache'
6import { asyncMiddleware, videosGetValidator } from '../middlewares' 6import { asyncMiddleware, videosGetValidator } from '../middlewares'
7import { VideoModel } from '../models/video/video' 7import { VideoModel } from '../models/video/video'
8import { VideosCaptionCache } from '../lib/cache/videos-caption-cache' 8import { VideosCaptionCache } from '../lib/cache/videos-caption-cache'
@@ -71,7 +71,7 @@ staticRouter.use(
71 71
72// robots.txt service 72// robots.txt service
73staticRouter.get('/robots.txt', 73staticRouter.get('/robots.txt',
74 asyncMiddleware(cache(ROUTE_CACHE_LIFETIME.ROBOTS)), 74 asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.ROBOTS)),
75 (_, res: express.Response) => { 75 (_, res: express.Response) => {
76 res.type('text/plain') 76 res.type('text/plain')
77 return res.send(CONFIG.INSTANCE.ROBOTS) 77 return res.send(CONFIG.INSTANCE.ROBOTS)
@@ -80,7 +80,7 @@ staticRouter.get('/robots.txt',
80 80
81// nodeinfo service 81// nodeinfo service
82staticRouter.use('/.well-known/nodeinfo', 82staticRouter.use('/.well-known/nodeinfo',
83 asyncMiddleware(cache(ROUTE_CACHE_LIFETIME.NODEINFO)), 83 asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.NODEINFO)),
84 (_, res: express.Response) => { 84 (_, res: express.Response) => {
85 return res.json({ 85 return res.json({
86 links: [ 86 links: [
@@ -93,7 +93,7 @@ staticRouter.use('/.well-known/nodeinfo',
93 } 93 }
94) 94)
95staticRouter.use('/nodeinfo/:version.json', 95staticRouter.use('/nodeinfo/:version.json',
96 asyncMiddleware(cache(ROUTE_CACHE_LIFETIME.NODEINFO)), 96 // asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.NODEINFO)),
97 asyncMiddleware(generateNodeinfo) 97 asyncMiddleware(generateNodeinfo)
98) 98)
99 99
@@ -161,13 +161,13 @@ async function generateNodeinfo (req: express.Request, res: express.Response, ne
161 nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION 161 nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION
162 } 162 }
163 } as HttpNodeinfoDiasporaSoftwareNsSchema20 163 } as HttpNodeinfoDiasporaSoftwareNsSchema20
164 res.set('Content-Type', 'application/json; profile=http://nodeinfo.diaspora.software/ns/schema/2.0#; charset=utf-8') 164 res.contentType('application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"')
165 } else { 165 } else {
166 json = { error: 'Nodeinfo schema version not handled' } 166 json = { error: 'Nodeinfo schema version not handled' }
167 res.status(404) 167 res.status(404)
168 } 168 }
169 169
170 return res.end(JSON.stringify(json)) 170 return res.send(json).end()
171} 171}
172 172
173async function downloadTorrent (req: express.Request, res: express.Response, next: express.NextFunction) { 173async function downloadTorrent (req: express.Request, res: express.Response, next: express.NextFunction) {