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

Resolve claim and stream types when there is a filter (#696)

Browse source 
* Resolve claim and stream types when there is a filter

## Symptom
Channel Page 'Content Type' filter not working

## Issue
The Advanced Filter work by placing a `?content=` URL param. The list component then parses it and makes the `claim_search` params accordingly. But:

1. There is a mix up in how the list component treats `?content=`.
    - The original code seems to treat this as a way to define the type externally but only for a list without `claimType` defined via code. In other words, if `claimType="something"`, `?content=` is ignored.
    - On the other hand, the Advanced Filter relies on `?content=` being used.

2. `?content=` is then split between `claimType` and `streamType`. The current code does not check if the split makes sense, e.g. if `?content=channel` and `streamType=['video']`, these 2 are incompatible and produces no results.

## Change
1. I'm not really sure what's the original intention, but let's just make `?content=` as an override/filter.

2. `?content=` should probably be limited to always be a subset of `claimType` and `streamType`. But this seems complicated to do, so for now let's just make always override/filter everything.  For that, we need to make sure the filtered `claimType` -- `streamType` combo makes sense.

* Fix 'Channel' filter not working in Wild West

## Cause
The Wild West list defines `release_time` to be 1 week ago. As long as this parameter exists, a channel `claim_search` produces no results (I thought channels have creation dates?). That is why an unfiltered Wild West never showed Channel Tiles.

## Change
The existing `release_time` handling does seem to hint that we should not set the parameter when searching for Channels. Expanded that to consider the final (filtered) claim type, not just the original.
This commit is contained in:
infinite-persistence 2022-01-14 08:06:13 -08:00 committed by GitHub
parent f3892325ce
commit 344da194ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ui/component/claimListDiscover/view.jsx
View file

@ -205,11 +205,42 @@ function ClaimListDiscover(props: Props) {
? null ? null
: langParam.concat(langParam === 'en' ? ',none' : ''); : langParam.concat(langParam === 'en' ? ',none' : '');
let claimTypeParam = claimType || defaultClaimType || null;
let streamTypeParam = streamType || defaultStreamType || null;
const contentTypeParam = urlParams.get(CS.CONTENT_KEY); const contentTypeParam = urlParams.get(CS.CONTENT_KEY);
const claimTypeParam = if (contentTypeParam) {
claimType || (CS.CLAIM_TYPES.includes(contentTypeParam) && contentTypeParam) || defaultClaimType || null; switch (contentTypeParam) {
const streamTypeParam = case CS.CLAIM_COLLECTION:
streamType || (CS.FILE_TYPES.includes(contentTypeParam) && contentTypeParam) || defaultStreamType || null; case CS.CLAIM_REPOST:
claimTypeParam = contentTypeParam;
break;
case CS.CLAIM_CHANNEL:
claimTypeParam = CS.CLAIM_CHANNEL;
streamTypeParam = undefined;
break;
case CS.FILE_VIDEO:
case CS.FILE_AUDIO:
case CS.FILE_IMAGE:
case CS.FILE_MODEL:
case CS.FILE_BINARY:
case CS.FILE_DOCUMENT:
streamTypeParam = contentTypeParam;
break;
case CS.CONTENT_ALL:
claimTypeParam = undefined;
streamTypeParam = undefined;
break;
default:
console.log('Invalid or unhandled CONTENT_KEY:', contentTypeParam);
break;
}
}
const durationParam = urlParams.get(CS.DURATION_KEY) || null; const durationParam = urlParams.get(CS.DURATION_KEY) || null;
const channelIdsInUrl = urlParams.get(CS.CHANNEL_IDS_KEY); const channelIdsInUrl = urlParams.get(CS.CHANNEL_IDS_KEY);
const channelIdsParam = channelIdsInUrl ? channelIdsInUrl.split(',') : channelIds; const channelIdsParam = channelIdsInUrl ? channelIdsInUrl.split(',') : channelIds;
@ -317,9 +348,9 @@ function ClaimListDiscover(props: Props) {
options.reposted_claim_id = repostedClaimId; options.reposted_claim_id = repostedClaimId;
} }
// IF release time, set it, else set fallback release times using the hack below. // IF release time, set it, else set fallback release times using the hack below.
if (releaseTime) { if (releaseTime && claimTypeParam !== CS.CLAIM_CHANNEL) {
options.release_time = releaseTime; options.release_time = releaseTime;
} else if (claimType !== CS.CLAIM_CHANNEL) { } else if (claimTypeParam !== CS.CLAIM_CHANNEL) {
if (orderParam === CS.ORDER_BY_TOP && freshnessParam !== CS.FRESH_ALL) { if (orderParam === CS.ORDER_BY_TOP && freshnessParam !== CS.FRESH_ALL) {
options.release_time = `>${Math.floor(moment().subtract(1, freshnessParam).startOf('hour').unix())}`; options.release_time = `>${Math.floor(moment().subtract(1, freshnessParam).startOf('hour').unix())}`;
} else if (orderParam === CS.ORDER_BY_NEW || orderParam === CS.ORDER_BY_TRENDING) { } else if (orderParam === CS.ORDER_BY_NEW || orderParam === CS.ORDER_BY_TRENDING) {