diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
| commit | b718fd22374d64534bcfe69932cf562894abed6a (patch) | |
| tree | 311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /server/lib/client-html.ts | |
| parent | adb115f5522bea4d52456a9fc5eb4140bb064476 (diff) | |
| parent | 501e961199578129629cf0567033d13efced9904 (diff) | |
| download | PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip | |
Merge branch 'develop' into pr/1285
Diffstat (limited to 'server/lib/client-html.ts')
| -rw-r--r-- | server/lib/client-html.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 1875ec1fc..b2c376e20 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | import * as express from 'express' | 1 | import * as express from 'express' |
| 2 | import * as Bluebird from 'bluebird' | 2 | import * as Bluebird from 'bluebird' |
| 3 | import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/models/i18n/i18n' | 3 | import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/models/i18n/i18n' |
| 4 | import { CONFIG, CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE, STATIC_PATHS } from '../initializers' | 4 | import { CONFIG, CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE } from '../initializers' |
| 5 | import { join } from 'path' | 5 | import { join } from 'path' |
| 6 | import { escapeHTML } from '../helpers/core-utils' | 6 | import { escapeHTML } from '../helpers/core-utils' |
| 7 | import { VideoModel } from '../models/video/video' | 7 | import { VideoModel } from '../models/video/video' |
| @@ -187,8 +187,8 @@ export class ClientHtml { | |||
| 187 | // Schema.org | 187 | // Schema.org |
| 188 | tagsString += `<script type="application/ld+json">${JSON.stringify(schemaTags)}</script>` | 188 | tagsString += `<script type="application/ld+json">${JSON.stringify(schemaTags)}</script>` |
| 189 | 189 | ||
| 190 | // SEO | 190 | // SEO, use origin video url so Google does not index remote videos |
| 191 | tagsString += `<link rel="canonical" href="${videoUrl}" />` | 191 | tagsString += `<link rel="canonical" href="${video.url}" />` |
| 192 | 192 | ||
| 193 | return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.OPENGRAPH_AND_OEMBED, tagsString) | 193 | return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.OPENGRAPH_AND_OEMBED, tagsString) |
| 194 | } | 194 | } |