LBRYCommunity/lbryinc
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request #41 from lbryio/claim-search-fix

Browse source 
fix: claim search
This commit is contained in:
Akinwale Ariwodola 2019-05-27 14:58:05 +01:00 committed by GitHub
commit 5bffcaf83d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dist/bundle.es.js vendored
View file

@ -1552,16 +1552,14 @@ const doCheckSubscription = (subscriptionUri, shouldNotify) => (dispatch, getSta
if (!savedSubscription) { if (!savedSubscription) {
throw Error(`Trying to find new content for ${subscriptionUri} but it doesn't exist in your subscriptions`); throw Error(`Trying to find new content for ${subscriptionUri} but it doesn't exist in your subscriptions`);
} } // We may be duplicating calls here. Can this logic be baked into doFetchClaimsByChannel?
const {
claimId
} = lbryRedux.parseURI(subscriptionUri); // We may be duplicating calls here. Can this logic be baked into doFetchClaimsByChannel?
lbryRedux.Lbry.claim_search({ lbryRedux.Lbry.claim_search({
channel_id: claimId, channel_name: subscriptionUri,
page: 1, page: 1,
page_size: PAGE_SIZE page_size: PAGE_SIZE,
winning: true
}).then(result => { }).then(result => {
const { const {
items: claimsInChannel items: claimsInChannel

22
dist/bundle.js vendored
View file

@ -2547,16 +2547,14 @@ var doCheckSubscription = function doCheckSubscription(subscriptionUri, shouldNo
if (!savedSubscription) { if (!savedSubscription) {
throw Error("Trying to find new content for ".concat(subscriptionUri, " but it doesn't exist in your subscriptions")); throw Error("Trying to find new content for ".concat(subscriptionUri, " but it doesn't exist in your subscriptions"));
} } // We may be duplicating calls here. Can this logic be baked into doFetchClaimsByChannel?
var _parseURI = Object(lbry_redux__WEBPACK_IMPORTED_MODULE_3__["parseURI"])(subscriptionUri),
claimId = _parseURI.claimId; // We may be duplicating calls here. Can this logic be baked into doFetchClaimsByChannel?
lbry_redux__WEBPACK_IMPORTED_MODULE_3__["Lbry"].claim_search({ lbry_redux__WEBPACK_IMPORTED_MODULE_3__["Lbry"].claim_search({
channel_id: claimId, channel_name: subscriptionUri,
page: 1, page: 1,
page_size: constants_claim__WEBPACK_IMPORTED_MODULE_0__["PAGE_SIZE"] page_size: constants_claim__WEBPACK_IMPORTED_MODULE_0__["PAGE_SIZE"],
winning: true
}).then(function (result) { }).then(function (result) {
var claimsInChannel = result.items; // may happen if subscribed to an abandoned channel or an empty channel var claimsInChannel = result.items; // may happen if subscribed to an abandoned channel or an empty channel
@ -2639,8 +2637,8 @@ var doChannelSubscribe = function doChannelSubscribe(subscription) {
}); // if the user isn't sharing data, keep the subscriptions entirely in the app }); // if the user isn't sharing data, keep the subscriptions entirely in the app
if (isSharingData) { if (isSharingData) {
var _parseURI2 = Object(lbry_redux__WEBPACK_IMPORTED_MODULE_3__["parseURI"])(subscription.uri), var _parseURI = Object(lbry_redux__WEBPACK_IMPORTED_MODULE_3__["parseURI"])(subscription.uri),
claimId = _parseURI2.claimId; // They are sharing data, we can store their subscriptions in our internal database claimId = _parseURI.claimId; // They are sharing data, we can store their subscriptions in our internal database
lbryio__WEBPACK_IMPORTED_MODULE_6__["default"].call('subscription', 'new', { lbryio__WEBPACK_IMPORTED_MODULE_6__["default"].call('subscription', 'new', {
@ -2667,8 +2665,8 @@ var doChannelUnsubscribe = function doChannelUnsubscribe(subscription) {
}); });
if (isSharingData) { if (isSharingData) {
var _parseURI3 = Object(lbry_redux__WEBPACK_IMPORTED_MODULE_3__["parseURI"])(subscription.uri), var _parseURI2 = Object(lbry_redux__WEBPACK_IMPORTED_MODULE_3__["parseURI"])(subscription.uri),
claimId = _parseURI3.claimId; claimId = _parseURI2.claimId;
lbryio__WEBPACK_IMPORTED_MODULE_6__["default"].call('subscription', 'delete', { lbryio__WEBPACK_IMPORTED_MODULE_6__["default"].call('subscription', 'delete', {
claim_id: claimId claim_id: claimId
@ -2721,8 +2719,8 @@ var doFetchMySubscriptions = function doFetchMySubscriptions() {
dbSubMap[sub.claim_id] = 1; dbSubMap[sub.claim_id] = 1;
}); });
reduxSubscriptions.forEach(function (sub) { reduxSubscriptions.forEach(function (sub) {
var _parseURI4 = Object(lbry_redux__WEBPACK_IMPORTED_MODULE_3__["parseURI"])(sub.uri), var _parseURI3 = Object(lbry_redux__WEBPACK_IMPORTED_MODULE_3__["parseURI"])(sub.uri),
claimId = _parseURI4.claimId; claimId = _parseURI3.claimId;
reduxSubMap[claimId] = 1; reduxSubMap[claimId] = 1;

9
src/redux/actions/subscriptions.js
View file

@ -156,10 +156,13 @@ export const doCheckSubscription = (subscriptionUri: string, shouldNotify?: bool
); );
} }
const { claimId } = parseURI(subscriptionUri);
// We may be duplicating calls here. Can this logic be baked into doFetchClaimsByChannel? // We may be duplicating calls here. Can this logic be baked into doFetchClaimsByChannel?
Lbry.claim_search({ channel_id: claimId, page: 1, page_size: PAGE_SIZE }).then(result => { Lbry.claim_search({
channel_name: subscriptionUri,
page: 1,
page_size: PAGE_SIZE,
winning: true,
}).then(result => {
const { items: claimsInChannel } = result; const { items: claimsInChannel } = result;
// may happen if subscribed to an abandoned channel or an empty channel // may happen if subscribed to an abandoned channel or an empty channel