From c7b1b92b118b0db21d542169bbe2ea9a33fd8943 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 24 Jan 2018 09:21:45 +0100
Subject: Use json for schema.org instead of tags

---
 scripts/release.sh           |  2 +-
 server/controllers/client.ts | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index 1b240ea38..0a78fe990 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -53,7 +53,7 @@ zip -r "PeerTube/$zip_name" "$directory_name/CREDITS.md" "$directory_name/FAQ.md
                             "$directory_name/dist" "$directory_name/package.json" \
                             "$directory_name/scripts" "$directory_name/support" \
                             "$directory_name/tsconfig.json" "$directory_name/yarn.lock" \
-                            "$directory_name/server/" \
+                            "$directory_name/server/" "$directory_name/shared/" \
                             || exit -1
 rm "$directory_name" || exit -1
 
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index bb02f5075..c85bd8a5e 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -85,6 +85,8 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
   ]
 
   const schemaTags = {
+    '@context': 'http://schema.org',
+    '@type': 'VideoObject',
     name: videoNameEscaped,
     description: videoDescriptionEscaped,
     duration: video.getActivityStreamDuration(),
@@ -95,25 +97,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)
 }
-- 
cgit v1.2.3