X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=f07e421b4795cbe0473dcd11ac796efbd2b6b67a;hb=2519d9fec6f84906d1b10770be791ad367186ca7;hp=bb02f5075e1a6af3b8bc5147988c2e2ea82b461f;hpb=093237cf79ea62207b51dd632a4c4fd1f74d71fd;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index bb02f5075..f07e421b4 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -11,6 +11,7 @@ const clientsRouter = express.Router()
 
 const distPath = join(root(), 'client', 'dist')
 const assetsImagesPath = join(root(), 'client', 'dist', 'client', 'assets', 'images')
+const manifestPath = join(root(), 'client', 'dist', 'manifest.json')
 const embedPath = join(distPath, 'standalone', 'videos', 'embed.html')
 const indexPath = join(distPath, 'index.html')
 
@@ -25,6 +26,7 @@ clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response,
 })
 
 // Static HTML/CSS/JS client files
+clientsRouter.use('/manifest.json', express.static(manifestPath, { maxAge: STATIC_MAX_AGE }))
 clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE }))
 clientsRouter.use('/client/assets/images', express.static(assetsImagesPath, { maxAge: STATIC_MAX_AGE }))
 
@@ -85,6 +87,8 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
   ]
 
   const schemaTags = {
+    '@context': 'http://schema.org',
+    '@type': 'VideoObject',
     name: videoNameEscaped,
     description: videoDescriptionEscaped,
     duration: video.getActivityStreamDuration(),
@@ -95,25 +99,21 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
   }
 
   let tagsString = ''
+
+  // Opengraph
   Object.keys(openGraphMetaTags).forEach(tagName => {
     const tagValue = openGraphMetaTags[tagName]
 
     tagsString += `<meta property="${tagName}" content="${tagValue}" />`
   })
 
+  // OEmbed
   for (const oembedLinkTag of oembedLinkTags) {
     tagsString += `<link rel="alternate" type="${oembedLinkTag.type}" href="${oembedLinkTag.href}" title="${oembedLinkTag.title}" />`
   }
 
-  tagsString += '<div itemprop="video" itemscope itemtype="http://schema.org/VideoObject">'
-  tagsString += '<h2>Video: <span itemprop="name">' + schemaTags.name + '</span></h2>'
-
-  Object.keys(schemaTags).forEach(tagName => {
-    const tagValue = schemaTags[tagName]
-    tagsString += `<meta itemprop="${tagName}" content="${tagValue}" />`
-  })
-
-  tagsString += '</div>'
+  // Schema.org
+  tagsString += `<script type="application/ld+json">${JSON.stringify(schemaTags)}</script>`
 
   return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString)
 }