From 369a0046cececb3e734c5908c453d2271697242a Mon Sep 17 00:00:00 2001 From: jessop Date: Thu, 26 Mar 2020 16:17:19 -0400 Subject: [PATCH] fix falsely anonymous channels in publishes --- dist/bundle.es.js | 11 ++++++++--- src/redux/selectors/claims.js | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index b538929..be62858 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -2354,12 +2354,17 @@ const makeSelectFirstRecommendedFileForUri = uri => reselect.createSelector(make // accepts a regular claim uri lbry://something // returns the channel uri that created this claim lbry://@channel const makeSelectChannelForClaimUri = (uri, includePrefix = false) => reselect.createSelector(makeSelectClaimForUri(uri), claim => { - if (!claim || !claim.signing_channel || !claim.signing_channel.canonical_url) { + if (!claim || !claim.signing_channel) { return null; } - const { canonical_url: canonicalUrl } = claim.signing_channel; - return includePrefix ? canonicalUrl : canonicalUrl.slice('lbry://'.length); + const { canonical_url: canonicalUrl, permanent_url: permanentUrl } = claim.signing_channel; + + if (canonicalUrl) { + return includePrefix ? canonicalUrl : canonicalUrl.slice('lbry://'.length); + } else { + return includePrefix ? permanentUrl : permanentUrl.slice('lbry://'.length); + } }); const makeSelectTagsForUri = uri => reselect.createSelector(makeSelectMetadataForUri(uri), metadata => { diff --git a/src/redux/selectors/claims.js b/src/redux/selectors/claims.js index 7b0c5dd..2020d45 100644 --- a/src/redux/selectors/claims.js +++ b/src/redux/selectors/claims.js @@ -576,12 +576,17 @@ export const makeSelectChannelForClaimUri = (uri: string, includePrefix: boolean createSelector( makeSelectClaimForUri(uri), (claim: ?Claim) => { - if (!claim || !claim.signing_channel || !claim.signing_channel.canonical_url) { + if (!claim || !claim.signing_channel) { return null; } - const { canonical_url: canonicalUrl } = claim.signing_channel; - return includePrefix ? canonicalUrl : canonicalUrl.slice('lbry://'.length); + const { canonical_url: canonicalUrl, permanent_url: permanentUrl } = claim.signing_channel; + + if (canonicalUrl) { + return includePrefix ? canonicalUrl : canonicalUrl.slice('lbry://'.length); + } else { + return includePrefix ? permanentUrl : permanentUrl.slice('lbry://'.length); + } } ); -- 2.43.4