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.
73 lines
3.4 KiB
JavaScript
73 lines
3.4 KiB
JavaScript
import { connect } from 'react-redux';
|
|
import {
|
|
doResolveUri,
|
|
makeSelectClaimForUri,
|
|
makeSelectIsUriResolving,
|
|
makeSelectClaimIsMine,
|
|
makeSelectClaimIsPending,
|
|
makeSelectClaimIsNsfw,
|
|
doFileGet,
|
|
makeSelectReflectingClaimForUri,
|
|
makeSelectClaimWasPurchased,
|
|
makeSelectStreamingUrlForUri,
|
|
makeSelectClaimIsStreamPlaceholder,
|
|
makeSelectCollectionIsMine,
|
|
doCollectionEdit,
|
|
makeSelectUrlsForCollectionId,
|
|
makeSelectIndexForUrlInCollection,
|
|
makeSelectTitleForUri,
|
|
makeSelectDateForUri,
|
|
} from 'lbry-redux';
|
|
import { selectMutedChannels, makeSelectChannelIsMuted } from 'redux/selectors/blocked';
|
|
import { selectBlackListedOutpoints, selectFilteredOutpoints } from 'lbryinc';
|
|
import { makeSelectIsActiveLivestream } from 'redux/selectors/livestream';
|
|
import { selectShowMatureContent } from 'redux/selectors/settings';
|
|
import { makeSelectHasVisitedUri } from 'redux/selectors/content';
|
|
import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
|
|
import { selectModerationBlockList } from 'redux/selectors/comments';
|
|
|
|
import ClaimPreview from './view';
|
|
import formatMediaDuration from 'util/formatMediaDuration';
|
|
|
|
const select = (state, props) => {
|
|
const claim = props.uri && makeSelectClaimForUri(props.uri)(state);
|
|
const media = claim && claim.value && (claim.value.video || claim.value.audio);
|
|
const mediaDuration = media && media.duration && formatMediaDuration(media.duration, { screenReader: true });
|
|
|
|
return {
|
|
claim,
|
|
mediaDuration,
|
|
date: props.uri && makeSelectDateForUri(props.uri)(state),
|
|
title: props.uri && makeSelectTitleForUri(props.uri)(state),
|
|
pending: props.uri && makeSelectClaimIsPending(props.uri)(state),
|
|
reflectingProgress: props.uri && makeSelectReflectingClaimForUri(props.uri)(state),
|
|
obscureNsfw: selectShowMatureContent(state) === false,
|
|
claimIsMine: props.uri && makeSelectClaimIsMine(props.uri)(state),
|
|
isResolvingUri: props.uri && makeSelectIsUriResolving(props.uri)(state),
|
|
isResolvingRepost: props.uri && makeSelectIsUriResolving(props.repostUrl)(state),
|
|
repostClaim: props.uri && makeSelectClaimForUri(props.uri)(state),
|
|
nsfw: props.uri && makeSelectClaimIsNsfw(props.uri)(state),
|
|
blackListedOutpoints: selectBlackListedOutpoints(state),
|
|
filteredOutpoints: selectFilteredOutpoints(state),
|
|
mutedUris: selectMutedChannels(state),
|
|
blockedUris: selectModerationBlockList(state),
|
|
hasVisitedUri: props.uri && makeSelectHasVisitedUri(props.uri)(state),
|
|
channelIsBlocked: props.uri && makeSelectChannelIsMuted(props.uri)(state),
|
|
isSubscribed: props.uri && makeSelectIsSubscribed(props.uri, true)(state),
|
|
streamingUrl: props.uri && makeSelectStreamingUrlForUri(props.uri)(state),
|
|
wasPurchased: props.uri && makeSelectClaimWasPurchased(props.uri)(state),
|
|
isLivestream: makeSelectClaimIsStreamPlaceholder(props.uri)(state),
|
|
isLivestreamActive: makeSelectIsActiveLivestream(props.uri)(state),
|
|
isCollectionMine: makeSelectCollectionIsMine(props.collectionId)(state),
|
|
collectionUris: makeSelectUrlsForCollectionId(props.collectionId)(state),
|
|
collectionIndex: makeSelectIndexForUrlInCollection(props.uri, props.collectionId)(state),
|
|
};
|
|
};
|
|
|
|
const perform = (dispatch) => ({
|
|
resolveUri: (uri) => dispatch(doResolveUri(uri)),
|
|
getFile: (uri) => dispatch(doFileGet(uri, false)),
|
|
editCollection: (id, params) => dispatch(doCollectionEdit(id, params)),
|
|
});
|
|
|
|
export default connect(select, perform)(ClaimPreview);
|