LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

serve static assets on urls with file extension #538

Merged
bones7242 merged 19 commits from 515-showlite-serves-asset into master 2018-07-20 18:57:12 +02:00
Conversation 2 Commits 19 Files changed 38 +34
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 264f7dd986 - Show all commits

26
client/build/utils/metaTags.js
View file

@ -40,6 +40,9 @@ var createBasicMetaTags = function createBasicMetaTags(_ref) {
return [{ return [{
property: 'og:title', property: 'og:title',
content: siteTitle content: siteTitle
}, {
property: 'twitter:title',
content: siteTitle
}, { }, {
property: 'og:url', property: 'og:url',
content: siteHost content: siteHost
@ -49,6 +52,9 @@ var createBasicMetaTags = function createBasicMetaTags(_ref) {
}, { }, {
property: 'og:description', property: 'og:description',
content: siteDescription content: siteDescription
}, {
property: 'twitter:description',
content: siteDescription
}, { }, {
property: 'twitter:site', property: 'twitter:site',
content: siteTwitter content: siteTwitter
@ -58,6 +64,9 @@ var createBasicMetaTags = function createBasicMetaTags(_ref) {
}, { }, {
property: 'og:image', property: 'og:image',
content: defaultThumbnail content: defaultThumbnail
}, {
property: 'twitter:image',
content: defaultThumbnail
}, { }, {
property: 'og:image:type', property: 'og:image:type',
content: 'image/jpeg' content: 'image/jpeg'
@ -74,6 +83,9 @@ var createChannelMetaTags = function createChannelMetaTags(_ref2) {
return [{ return [{
property: 'og:title', property: 'og:title',
content: "".concat(name, " on ").concat(siteTitle) content: "".concat(name, " on ").concat(siteTitle)
}, {
property: 'twitter:title',
content: "".concat(name, " on ").concat(siteTitle)
}, { }, {
property: 'og:url', property: 'og:url',
content: "".concat(siteHost, "/").concat(name, ":").concat(longId) content: "".concat(siteHost, "/").concat(name, ":").concat(longId)
@ -111,6 +123,9 @@ var createAssetMetaTags = function createAssetMetaTags(_ref3) {
var metaTags = [{ var metaTags = [{
property: 'og:title', property: 'og:title',
content: ogTitle content: ogTitle
}, {
property: 'twitter:title',
content: ogTitle
}, { }, {
property: 'og:url', property: 'og:url',
content: showUrl content: showUrl
@ -120,6 +135,9 @@ var createAssetMetaTags = function createAssetMetaTags(_ref3) {
}, { }, {
property: 'og:description', property: 'og:description',
content: ogDescription content: ogDescription
}, {
property: 'twitter:description',
content: ogDescription
}, { }, {
property: 'og:image:width', property: 'og:image:width',
content: 600 content: 600
@ -148,6 +166,10 @@ var createAssetMetaTags = function createAssetMetaTags(_ref3) {
property: 'og:image', property: 'og:image',
content: ogThumbnail content: ogThumbnail
}); });
metaTags.push({
property: 'twitter:image',
content: ogThumbnail
});
metaTags.push({ metaTags.push({
property: 'og:image:type', property: 'og:image:type',
content: ogThumbnailContentType content: ogThumbnailContentType
@ -189,6 +211,10 @@ var createAssetMetaTags = function createAssetMetaTags(_ref3) {
property: 'og:image', property: 'og:image',
content: source content: source
}); });
metaTags.push({
property: 'twitter:image',
content: source
});
metaTags.push({ metaTags.push({
property: 'og:image:type', property: 'og:image:type',
content: contentType content: contentType

8
client/src/utils/metaTags.js
View file

@ -21,12 +21,15 @@ const determineOgThumbnailContentType = (thumbnail) => {
const createBasicMetaTags = ({siteHost, siteDescription, siteTitle, siteTwitter, defaultThumbnail}) => { const createBasicMetaTags = ({siteHost, siteDescription, siteTitle, siteTwitter, defaultThumbnail}) => {
return [ return [
{property: 'og:title', content: siteTitle}, {property: 'og:title', content: siteTitle},
{property: 'twitter:title', content: siteTitle},
{property: 'og:url', content: siteHost}, {property: 'og:url', content: siteHost},
{property: 'og:site_name', content: siteTitle}, {property: 'og:site_name', content: siteTitle},
{property: 'og:description', content: siteDescription}, {property: 'og:description', content: siteDescription},
{property: 'twitter:description', content: siteDescription},
{property: 'twitter:site', content: siteTwitter}, {property: 'twitter:site', content: siteTwitter},
{property: 'twitter:card', content: 'summary_large_image'}, {property: 'twitter:card', content: 'summary_large_image'},
{property: 'og:image', content: defaultThumbnail}, {property: 'og:image', content: defaultThumbnail},
{property: 'twitter:image', content: defaultThumbnail},
{property: 'og:image:type', content: 'image/jpeg'}, {property: 'og:image:type', content: 'image/jpeg'},
]; ];
}; };
@ -35,6 +38,7 @@ const createChannelMetaTags = ({siteHost, siteTitle, siteTwitter, channel}) => {
const { name, longId } = channel; const { name, longId } = channel;
return [ return [
{property: 'og:title', content: `${name} on ${siteTitle}`}, {property: 'og:title', content: `${name} on ${siteTitle}`},
{property: 'twitter:title', content: `${name} on ${siteTitle}`},
{property: 'og:url', content: `${siteHost}/${name}:${longId}`}, {property: 'og:url', content: `${siteHost}/${name}:${longId}`},
{property: 'og:site_name', content: siteTitle}, {property: 'og:site_name', content: siteTitle},
{property: 'og:description', content: `${name}, a channel on ${siteTitle}`}, {property: 'og:description', content: `${name}, a channel on ${siteTitle}`},
@ -55,9 +59,11 @@ const createAssetMetaTags = ({siteHost, siteTitle, siteTwitter, asset, defaultDe
const ogThumbnail = claimData.thumbnail || defaultThumbnail; const ogThumbnail = claimData.thumbnail || defaultThumbnail;
const metaTags = [ const metaTags = [
{property: 'og:title', content: ogTitle}, {property: 'og:title', content: ogTitle},
{property: 'twitter:title', content: ogTitle},
{property: 'og:url', content: showUrl}, {property: 'og:url', content: showUrl},
{property: 'og:site_name', content: siteTitle}, {property: 'og:site_name', content: siteTitle},
{property: 'og:description', content: ogDescription}, {property: 'og:description', content: ogDescription},
{property: 'twitter:description', content: ogDescription},
{property: 'og:image:width', content: 600}, {property: 'og:image:width', content: 600},
{property: 'og:image:height', content: 315}, {property: 'og:image:height', content: 315},
{property: 'twitter:site', content: siteTwitter}, {property: 'twitter:site', content: siteTwitter},
@ -67,6 +73,7 @@ const createAssetMetaTags = ({siteHost, siteTitle, siteTwitter, asset, defaultDe
metaTags.push({property: 'og:video:secure_url', content: source}); metaTags.push({property: 'og:video:secure_url', content: source});
metaTags.push({property: 'og:video:type', content: contentType}); metaTags.push({property: 'og:video:type', content: contentType});
metaTags.push({property: 'og:image', content: ogThumbnail}); metaTags.push({property: 'og:image', content: ogThumbnail});
metaTags.push({property: 'twitter:image', content: ogThumbnail});
metaTags.push({property: 'og:image:type', content: ogThumbnailContentType}); metaTags.push({property: 'og:image:type', content: ogThumbnailContentType});
metaTags.push({property: 'og:type', content: 'video.other'}); metaTags.push({property: 'og:type', content: 'video.other'});
metaTags.push({property: 'twitter:card', content: 'player'}); metaTags.push({property: 'twitter:card', content: 'player'});
@ -78,6 +85,7 @@ const createAssetMetaTags = ({siteHost, siteTitle, siteTwitter, asset, defaultDe
metaTags.push({property: 'twitter:player:stream:content_type', content: contentType}); metaTags.push({property: 'twitter:player:stream:content_type', content: contentType});
} else { } else {
metaTags.push({property: 'og:image', content: source}); metaTags.push({property: 'og:image', content: source});
metaTags.push({property: 'twitter:image', content: source});
metaTags.push({property: 'og:image:type', content: contentType}); metaTags.push({property: 'og:image:type', content: contentType});
metaTags.push({property: 'og:type', content: 'article'}); metaTags.push({property: 'og:type', content: 'article'});
metaTags.push({property: 'twitter:card', content: 'summary_large_image'}); metaTags.push({property: 'twitter:card', content: 'summary_large_image'});