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

refactor createAssetCanonicalLink and usages

Browse source
This commit is contained in:
Travis Eden 2018-11-02 13:27:18 -04:00
parent 1833c326a4
commit 458441600d
6 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/components/AssetPreview/index.jsx
View file

@ -4,7 +4,7 @@ import createCanonicalLink from '../../../../utils/createCanonicalLink';
const AssetPreview = ({ defaultThumbnail, claimData }) => { const AssetPreview = ({ defaultThumbnail, claimData }) => {
const { name, fileExt, contentType, thumbnail, title } = claimData; const { name, fileExt, contentType, thumbnail, title } = claimData;
const showUrl = createCanonicalLink({ asset: { claimData } }); const showUrl = createCanonicalLink({ asset: { ...claimData }});
const embedUrl = `${showUrl}.${fileExt}`; const embedUrl = `${showUrl}.${fileExt}`;
return ( return (
<Link to={showUrl} className='asset-preview'> <Link to={showUrl} className='asset-preview'>

2
client/src/containers/AssetInfo/view.jsx
View file

@ -16,7 +16,7 @@ class AssetInfo extends React.Component {
const { asset } = this.props; const { asset } = this.props;
const { claimViews, claimData: { channelName, channelShortId, description, name, fileExt, contentType, thumbnail, host } } = asset; const { claimViews, claimData: { channelName, channelShortId, description, name, fileExt, contentType, thumbnail, host } } = asset;
const assetCanonicalUrl = `${host}${createCanonicalLink({asset})}`; const assetCanonicalUrl = `${host}${createCanonicalLink({ asset: { ...asset.claimData, shortId: asset.shortId }})}`;
let channelCanonicalUrl; let channelCanonicalUrl;
if (channelName) { if (channelName) {

2
client/src/containers/SEO/view.jsx
View file

@ -22,7 +22,7 @@ class SEO extends React.Component {
channel, channel,
}); });
const canonicalLink = `${host}${createCanonicalLink({ const canonicalLink = `${host}${createCanonicalLink({
asset, asset: asset ? { ...asset.claimData, shortId: asset.shortId } : undefined,
channel, channel,
page: pageUri, page: pageUri,
})}`; })}`;

2
client/src/utils/createAssetMetaTags.js
View file

@ -38,7 +38,7 @@ const determineMediaType = (contentType) => {
const createAssetMetaTags = (asset) => { const createAssetMetaTags = (asset) => {
const { claimData } = asset; const { claimData } = asset;
const { contentType } = claimData; const { contentType } = claimData;
const canonicalLink = createCanonicalLink({asset}); const canonicalLink = createCanonicalLink({ asset: { ...asset.claimData, shortId: asset.shortId }});
const showUrl = `${host}${canonicalLink}`; const showUrl = `${host}${canonicalLink}`;
const serveUrl = `${showUrl}.${claimData.fileExt}`; const serveUrl = `${showUrl}.${claimData.fileExt}`;

3
server/render/src/handleShowRender.jsx
View file

@ -22,7 +22,8 @@ const getCanonicalUrlFromShow = show => {
const requestType = show.request.type; const requestType = show.request.type;
switch (requestType) { switch (requestType) {
case 'ASSET_DETAILS': case 'ASSET_DETAILS':
return createCanonicalLink({ asset: show.assetList[requestId.key] }); const asset = show.assetList[requestId.key];
return createCanonicalLink({ asset: { ...asset.claimData, shortId: asset.shortId }});
case 'CHANNEL': case 'CHANNEL':
return createCanonicalLink({ channel: show.channelList[requestId.key] }); return createCanonicalLink({ channel: show.channelList[requestId.key] });
default: default:

10
utils/createCanonicalLink.js
View file

@ -3,14 +3,8 @@ const createBasicCanonicalLink = (page) => {
}; };
const createAssetCanonicalLink = (asset) => { const createAssetCanonicalLink = (asset) => {
let channelName, channelShortId, name, claimId; const { channelName, channelShortId, name, claimId, shortId } = asset;
if (asset.claimData) { return channelName ? `/${channelName}:${channelShortId}/${name}` : `/${shortId || claimId}/${name}`;
({ channelName, channelShortId, name, claimId } = asset.claimData);
}
if (channelName) {
return `/${channelName}:${channelShortId}/${name}`;
}
return `/${asset.shortId || claimId}/${name}`;
}; };
const createChannelCanonicalLink = (channel) => { const createChannelCanonicalLink = (channel) => {