3b47edc3b9
* ❌ Remove old method of displaying active livestreams Completely remove it for now to make the commit deltas clearer. We'll replace it with the new method at the end. * Fetch and store active-livestream info in redux * Tiles can now query active-livestream state from redux instead of getting from parent. * ⏪ ClaimTilesDiscover: revert and cleanup ## Simplify - Simplify to just `uris` instead of having multiple arrays (`uris`, `modifiedUris`, `prevUris`) - The `prevUris` is for CLS prevention. With this removal, the CLS issue is back, but we'll handle it differently later. - Temporarily disable the view-count fetching. Code is left there so that I don't forget. ## Fix - `shouldPerformSearch` was never true when `prefixUris` is present. Corrected the logic. - Aside: prefix and pin is so similar in function. Hm .... * ClaimTilesDiscover: factor out options ## Change Move the `option` code outside and passed in as a pre-calculated prop. ## Reason To skip rendering while waiting for `claim_search`, we need to add `React.memo(areEqual)`. However, the flag that determines if we are fetching `claim_search` (fetchingClaimSearchByQuery[]) depends on the derived options as the key. Instead of calculating `options` twice, we moved it to the props so both sides can use it. It also makes the component a bit more readable. The downside is that the prop-passing might not be clear. * ClaimTilesDiscover: reduce ~17 renders at startup to just 2. * ClaimTilesDiscover: fill with placeholder while waiting for claim_search ## Issue Livestream claims are fetched seperately, so they might already exists. While claim_search is running, the list only consists of livestreams (collapsed). ## Fix Fill up the space with placeholders to prevent layout shift. * Add 'useFetchViewCount' to handle fetching from lists This effect also stashes fetched uris, so that we won't re-fetch the same uris during the same instance (e.g. during infinite scroll). * ⏪ ClaimListDiscover: revert and cleanup ## Revert - Removed the 'finalUris' stuff that was meant to "pause" visual changes when fetching. I think it'll be cleaner to use React.memo to achieve that. ## Alterations - Added `renderUri` to make it clear which array that this component will render. - Re-do the way we fetch view counts now that 'finalUris' is gone. Not the best method, but at least correct for now. * ClaimListDiscover: add prefixUris, similar to ClaimTilesDiscover This will be initially used to append livestreams at the top. * ✅ Re-enable active livestream tiles using the new method * doFetchActiveLivestreams: add interval check - Added a default minimum of 5 minutes between fetches. Clients can bypass this through `forceFetch` if needed. * doFetchActiveLivestreams: add option check We'll need to support different 'orderBy', so adding an "options check" when determining if we just made the same fetch. * WildWest: limit livestream tiles + add ability to show more Most likely this behavior will change in the future, so we'll leave `ClaimListDiscover` untouched and handle the logic at the page level. This solution uses 2 `ClaimListDiscover` -- if the reduced livestream list is visible, it handles the header; else the normal list handles the header. * Use better tile-count on larger screens. Used the same method as how the homepage does it.
89 lines
2.6 KiB
JavaScript
89 lines
2.6 KiB
JavaScript
// @flow
|
|
|
|
import { isNameValid, isURIValid, normalizeURI, parseURI } from 'lbry-redux';
|
|
import { URL as SITE_URL, URL_LOCAL, URL_DEV } from 'config';
|
|
|
|
export function createNormalizedSearchKey(query: string) {
|
|
const FROM = '&from=';
|
|
|
|
// Ignore the "page" (`from`) because we don't care what the last page
|
|
// searched was, we want everything.
|
|
let normalizedQuery = query;
|
|
if (normalizedQuery.includes(FROM)) {
|
|
const a = normalizedQuery.indexOf(FROM);
|
|
const b = normalizedQuery.indexOf('&', a + FROM.length);
|
|
if (b > a) {
|
|
normalizedQuery = normalizedQuery.substring(0, a) + normalizedQuery.substring(b);
|
|
} else {
|
|
normalizedQuery = normalizedQuery.substring(0, a);
|
|
}
|
|
}
|
|
return normalizedQuery;
|
|
}
|
|
|
|
/**
|
|
* getUriForSearchTerm
|
|
* @param term
|
|
* @returns {string[]|*[]|(string|string)[]}
|
|
*/
|
|
export function getUriForSearchTerm(term: string) {
|
|
const WEB_DEV_PREFIX = `${URL_DEV}/`;
|
|
const WEB_LOCAL_PREFIX = `${URL_LOCAL}/`;
|
|
const WEB_PROD_PREFIX = `${SITE_URL}/`;
|
|
const ODYSEE_PREFIX = `https://odysee.com/`;
|
|
const includesLbryTvProd = term.includes(WEB_PROD_PREFIX);
|
|
const includesOdysee = term.includes(ODYSEE_PREFIX);
|
|
const includesLbryTvLocal = term.includes(WEB_LOCAL_PREFIX);
|
|
const includesLbryTvDev = term.includes(WEB_DEV_PREFIX);
|
|
const wasCopiedFromWeb = includesLbryTvDev || includesLbryTvLocal || includesLbryTvProd || includesOdysee;
|
|
const isLbryUrl = term.startsWith('lbry://') && term !== 'lbry://';
|
|
const error = '';
|
|
|
|
const addLbryIfNot = (term) => {
|
|
return term.startsWith('lbry://') ? term : `lbry://${term}`;
|
|
};
|
|
|
|
if (wasCopiedFromWeb) {
|
|
let prefix = WEB_PROD_PREFIX;
|
|
if (includesLbryTvLocal) prefix = WEB_LOCAL_PREFIX;
|
|
if (includesLbryTvDev) prefix = WEB_DEV_PREFIX;
|
|
if (includesOdysee) prefix = ODYSEE_PREFIX;
|
|
|
|
let query = (term && term.slice(prefix.length).replace(/:/g, '#')) || '';
|
|
try {
|
|
const lbryUrl = `lbry://${query}`;
|
|
parseURI(lbryUrl);
|
|
return [lbryUrl, null];
|
|
} catch (e) {
|
|
return [query, 'error'];
|
|
}
|
|
}
|
|
|
|
if (!isLbryUrl) {
|
|
if (term.startsWith('@')) {
|
|
if (isNameValid(term.slice(1))) {
|
|
return [term, null];
|
|
} else {
|
|
return [term, error];
|
|
}
|
|
}
|
|
return [addLbryIfNot(term), null];
|
|
} else {
|
|
try {
|
|
const isValid = isURIValid(term);
|
|
if (isValid) {
|
|
let uri;
|
|
try {
|
|
uri = normalizeURI(term);
|
|
} catch (e) {
|
|
return [term, null];
|
|
}
|
|
return [uri, null];
|
|
} else {
|
|
return [term, null];
|
|
}
|
|
} catch (e) {
|
|
return [term, 'error'];
|
|
}
|
|
}
|
|
}
|