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.
62 lines
2.4 KiB
JavaScript
62 lines
2.4 KiB
JavaScript
// @flow
|
|
import { createSelector } from 'reselect';
|
|
import { selectMyClaims, selectPendingClaims } from 'lbry-redux';
|
|
|
|
const selectState = (state) => state.livestream || {};
|
|
|
|
// select non-pending claims without sources for given channel
|
|
export const makeSelectLivestreamsForChannelId = (channelId: string) =>
|
|
createSelector(selectState, selectMyClaims, (livestreamState, myClaims = []) => {
|
|
return myClaims
|
|
.filter(
|
|
(claim) =>
|
|
claim.value_type === 'stream' &&
|
|
claim.value &&
|
|
!claim.value.source &&
|
|
claim.confirmations > 0 &&
|
|
claim.signing_channel &&
|
|
claim.signing_channel.claim_id === channelId
|
|
)
|
|
.sort((a, b) => b.timestamp - a.timestamp); // newest first
|
|
});
|
|
|
|
export const selectFetchingLivestreams = createSelector(selectState, (state) => state.fetchingById);
|
|
export const selectViewersById = createSelector(selectState, (state) => state.viewersById);
|
|
|
|
export const makeSelectIsFetchingLivestreams = (channelId: string) =>
|
|
createSelector(selectFetchingLivestreams, (fetchingLivestreams) => Boolean(fetchingLivestreams[channelId]));
|
|
|
|
export const makeSelectViewersForId = (channelId: string) =>
|
|
createSelector(selectViewersById, (viewers) => viewers[channelId]);
|
|
|
|
export const makeSelectPendingLivestreamsForChannelId = (channelId: string) =>
|
|
createSelector(selectPendingClaims, (pendingClaims) => {
|
|
return pendingClaims.filter(
|
|
(claim) =>
|
|
claim.value_type === 'stream' &&
|
|
claim.value &&
|
|
!claim.value.source &&
|
|
claim.signing_channel &&
|
|
claim.signing_channel.claim_id === channelId
|
|
);
|
|
});
|
|
|
|
export const selectActiveLivestreams = createSelector(selectState, (state) => state.activeLivestreams);
|
|
|
|
export const makeSelectIsActiveLivestream = (uri: string) =>
|
|
createSelector(selectState, (state) => {
|
|
const activeLivestreamValues = (state.activeLivestreams && Object.values(state.activeLivestreams)) || [];
|
|
// $FlowFixMe
|
|
return Boolean(activeLivestreamValues.find((v) => v.latestClaimUri === uri));
|
|
});
|
|
|
|
export const makeSelectActiveLivestreamUris = (uri: string) =>
|
|
createSelector(selectState, (state) => {
|
|
const activeLivestreamValues = (state.activeLivestreams && Object.values(state.activeLivestreams)) || [];
|
|
const uris = [];
|
|
activeLivestreamValues.forEach((v) => {
|
|
// $FlowFixMe
|
|
if (v.latestClaimUri) uris.push(v.latestClaimUri);
|
|
});
|
|
return uris;
|
|
});
|