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

Merge pull request #893 from jessopb/j19bugfix

Browse source 
small bugfixes to outpoint and tweak markdown
This commit is contained in:
jessopb 2019-02-02 22:03:36 -05:00 committed by GitHub
commit c0e20f0420
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class AssetDisplay extends React.Component {
if (typeof contentType === 'string') { if (typeof contentType === 'string') {
fileExt = contentType.split('/')[1] || 'jpg'; fileExt = contentType.split('/')[1] || 'jpg';
} }
const sourceUrl = `${createCanonicalLink({ asset: asset.claimData })}.${fileExt}?${outpoint}`; const sourceUrl = `${createCanonicalLink({ asset: asset.claimData })}.${fileExt}?outpoint=${outpoint}`;
return ( return (
<div className={'asset-display'}> <div className={'asset-display'}>
{(status === LOCAL_CHECK) && {(status === LOCAL_CHECK) &&

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

@ -37,7 +37,7 @@ class AssetInfo extends React.Component {
{ description && ( { description && (
<RowLabeled <RowLabeled
label={<Label value={'Description'} />} label={<Label value={'Description'} />}
content={<div className='asset-info__description'><ReactMarkdown source={description}/></div>} content={<div className='asset-info__description'><ReactMarkdown source={description} disallowedTypes={['image']}/></div>}
/> />
)} )}
{editable && ( {editable && (

9
server/utils/getClaimData.js
View file

@ -10,7 +10,14 @@ module.exports = async (data, chName = null, chShortId = null) => {
// TODO: Refactor getching the channel name out; requires invasive changes. // TODO: Refactor getching the channel name out; requires invasive changes.
const dataVals = data.dataValues ? data.dataValues : data; const dataVals = data.dataValues ? data.dataValues : data;
const txid = dataVals.transaction_hash_id || dataVals.txid; const txid = dataVals.transaction_hash_id || dataVals.txid;
const nout = dataVals.vout || dataVals.nout; let nout;
if (typeof dataVals.vout === 'number') {
nout = dataVals.vout;
} else {
nout = dataVals.nout;
}
const outpoint = `${txid}:${nout}`; const outpoint = `${txid}:${nout}`;
const certificateId = dataVals.publisher_id || dataVals.certificateId; const certificateId = dataVals.publisher_id || dataVals.certificateId;
const fileExt = data.generated_extension || dataVals.fileExt; const fileExt = data.generated_extension || dataVals.fileExt;