LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Fix claim name undefined in buildURI bug

Browse source
This commit is contained in:
liamcardenas 2018-03-08 17:56:48 -08:00
parent 371a254867
commit 1cb122c839
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/component/transactionList/internal/TransactionListItem.jsx
View file

@ -74,7 +74,7 @@ class TransactionListItem extends React.PureComponent {
<Link
className="button-text"
navigate="/show"
navigateParams={{ uri: buildURI({ name, claimId }) }}
navigateParams={{ uri: buildURI({ claimName: name, claimId }) }}
>
{name}
</Link>

16
src/renderer/lbryURI.js
View file

@ -148,13 +148,13 @@ export function parseURI(URI, requireProto = false) {
export function buildURI(URIObj, includeProto = true) {
const { claimId, claimSequence, bidPosition, contentName, channelName } = URIObj;
let { claim_name, path } = URIObj;
let { claimName, path } = URIObj;
if (channelName) {
const channelNameFormatted = channelName.startsWith('@') ? channelName : `@${channelName}`;
if (!claim_name) {
claim_name = channelNameFormatted;
} else if (claim_name !== channelNameFormatted) {
if (!claimName) {
claimName = channelNameFormatted;
} else if (claimName !== channelNameFormatted) {
throw new Error(
__(
'Received a channel content URI, but claim name and channelName do not match. "name" represents the value in the name position of the URI (lbry://name...), which for channel content will be the channel name. In most cases, to construct a channel URI you should just pass channelName and contentName.'
@ -164,8 +164,8 @@ export function buildURI(URIObj, includeProto = true) {
}
if (contentName) {
if (!claim_name) {
claim_name = contentName;
if (!claimName) {
claimName = contentName;
} else if (!path) {
path = contentName;
}
@ -180,7 +180,7 @@ export function buildURI(URIObj, includeProto = true) {
return (
(includeProto ? 'lbry://' : '') +
claim_name +
claimName +
(claimId ? `#${claimId}` : '') +
(claimSequence ? `:${claimSequence}` : '') +
(bidPosition ? `${bidPosition}` : '') +
@ -193,7 +193,7 @@ export function normalizeURI(URI) {
if (URI.match(/pending_claim/)) return URI;
const { claim_name, path, bidPosition, claimSequence, claimId } = parseURI(URI);
return buildURI({ claim_name, path, claimSequence, bidPosition, claimId });
return buildURI({ claimName: claim_name, path, claimSequence, bidPosition, claimId });
}
export function isURIValid(URI) {

2
src/renderer/page/channel/view.jsx
View file

@ -58,7 +58,7 @@ class ChannelPage extends React.PureComponent {
<FileTile
key={claim.claim_id}
uri={buildURI({
name: claim.name,
claimName: claim.name,
claimId: claim.claim_id,
})}
showLocal

2
src/renderer/redux/actions/content.js
View file

@ -523,7 +523,7 @@ export function doAbandonClaim(txid, nout) {
claimId,
},
});
dispatch(doResolveUri(buildURI({ name, claimId })));
dispatch(doResolveUri(buildURI({ claimName, claimId })));
dispatch(doFetchClaimListMine());
} else {
dispatch(doOpenModal(MODALS.TRANSACTION_FAILED));

2
src/renderer/redux/actions/search.js
View file

@ -41,7 +41,7 @@ export function doSearch(rawQuery) {
data.forEach(result => {
const uri = buildURI({
name: result.name,
claimName: result.name,
claimId: result.claimId,
});
actions.push(doResolveUri(uri));