2021-04-23 05:04:11 +02:00
|
|
|
// @flow
|
2021-12-16 22:59:13 +01:00
|
|
|
|
2021-04-23 05:04:11 +02:00
|
|
|
import * as ACTIONS from 'constants/action_types';
|
|
|
|
import { handleActions } from 'util/redux-utils';
|
|
|
|
|
|
|
|
const defaultState: LivestreamState = {
|
2021-04-23 19:11:53 +02:00
|
|
|
fetchingById: {},
|
2021-06-17 20:55:23 +02:00
|
|
|
viewersById: {},
|
2021-12-16 22:59:13 +01:00
|
|
|
fetchingActiveLivestreams: 'pending',
|
Livestream category improvements (#7115)
* ❌ 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.
2021-09-24 16:26:21 +02:00
|
|
|
activeLivestreams: null,
|
|
|
|
activeLivestreamsLastFetchedDate: 0,
|
|
|
|
activeLivestreamsLastFetchedOptions: {},
|
2021-12-22 17:12:44 +01:00
|
|
|
activeLivestreamInitialized: false,
|
2022-04-29 15:54:14 +02:00
|
|
|
socketConnectionById: {},
|
2021-04-23 05:04:11 +02:00
|
|
|
};
|
|
|
|
|
2022-04-15 12:46:46 +02:00
|
|
|
function updateViewersById(activeLivestreams, originalState) {
|
|
|
|
if (activeLivestreams) {
|
|
|
|
const viewersById = Object.assign({}, originalState);
|
|
|
|
Object.values(activeLivestreams).forEach((data) => {
|
|
|
|
// $FlowFixMe: mixed
|
|
|
|
if (data.claimId && data.viewCount) {
|
|
|
|
// $FlowFixMe: mixed
|
|
|
|
viewersById[data.claimId] = data.viewCount;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
return viewersById;
|
|
|
|
}
|
|
|
|
|
|
|
|
return originalState;
|
|
|
|
}
|
|
|
|
|
2021-04-23 05:04:11 +02:00
|
|
|
export default handleActions(
|
|
|
|
{
|
|
|
|
[ACTIONS.FETCH_NO_SOURCE_CLAIMS_STARTED]: (state: LivestreamState, action: any): LivestreamState => {
|
|
|
|
const claimId = action.data;
|
2021-04-23 19:11:53 +02:00
|
|
|
const newIdsFetching = Object.assign({}, state.fetchingById);
|
2021-04-23 05:04:11 +02:00
|
|
|
newIdsFetching[claimId] = true;
|
|
|
|
|
2021-04-23 19:11:53 +02:00
|
|
|
return { ...state, fetchingById: newIdsFetching };
|
2021-04-23 05:04:11 +02:00
|
|
|
},
|
|
|
|
[ACTIONS.FETCH_NO_SOURCE_CLAIMS_COMPLETED]: (state: LivestreamState, action: any): LivestreamState => {
|
|
|
|
const claimId = action.data;
|
2021-04-23 19:11:53 +02:00
|
|
|
const newIdsFetching = Object.assign({}, state.fetchingById);
|
2021-04-23 05:04:11 +02:00
|
|
|
newIdsFetching[claimId] = false;
|
|
|
|
|
2021-04-23 19:11:53 +02:00
|
|
|
return { ...state, fetchingById: newIdsFetching };
|
2021-04-23 05:04:11 +02:00
|
|
|
},
|
|
|
|
[ACTIONS.FETCH_NO_SOURCE_CLAIMS_FAILED]: (state: LivestreamState, action: any) => {
|
|
|
|
const claimId = action.data;
|
2021-04-23 19:11:53 +02:00
|
|
|
const newIdsFetching = Object.assign({}, state.fetchingById);
|
2021-04-23 05:04:11 +02:00
|
|
|
newIdsFetching[claimId] = false;
|
|
|
|
|
2021-04-23 19:11:53 +02:00
|
|
|
return { ...state, fetchingById: newIdsFetching };
|
2021-04-23 05:04:11 +02:00
|
|
|
},
|
2021-06-17 20:55:23 +02:00
|
|
|
[ACTIONS.VIEWERS_RECEIVED]: (state: LivestreamState, action: any) => {
|
|
|
|
const { connected, claimId } = action.data;
|
|
|
|
const newViewersById = Object.assign({}, state.viewersById);
|
|
|
|
newViewersById[claimId] = connected;
|
|
|
|
return { ...state, viewersById: newViewersById };
|
|
|
|
},
|
Livestream category improvements (#7115)
* ❌ 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.
2021-09-24 16:26:21 +02:00
|
|
|
[ACTIONS.FETCH_ACTIVE_LIVESTREAMS_STARTED]: (state: LivestreamState) => {
|
|
|
|
return { ...state, fetchingActiveLivestreams: true };
|
|
|
|
},
|
|
|
|
[ACTIONS.FETCH_ACTIVE_LIVESTREAMS_FAILED]: (state: LivestreamState) => {
|
|
|
|
return { ...state, fetchingActiveLivestreams: false };
|
|
|
|
},
|
|
|
|
[ACTIONS.FETCH_ACTIVE_LIVESTREAMS_COMPLETED]: (state: LivestreamState, action: any) => {
|
|
|
|
const { activeLivestreams, activeLivestreamsLastFetchedDate, activeLivestreamsLastFetchedOptions } = action.data;
|
|
|
|
return {
|
|
|
|
...state,
|
|
|
|
fetchingActiveLivestreams: false,
|
|
|
|
activeLivestreams,
|
|
|
|
activeLivestreamsLastFetchedDate,
|
|
|
|
activeLivestreamsLastFetchedOptions,
|
2022-04-15 12:46:46 +02:00
|
|
|
viewersById: updateViewersById(activeLivestreams, state.viewersById),
|
Livestream category improvements (#7115)
* ❌ 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.
2021-09-24 16:26:21 +02:00
|
|
|
};
|
|
|
|
},
|
2022-01-06 18:49:49 +01:00
|
|
|
[ACTIONS.ADD_CHANNEL_TO_ACTIVE_LIVESTREAMS]: (state: LivestreamState, action: any) => {
|
2021-12-22 17:12:44 +01:00
|
|
|
const activeLivestreams = Object.assign({}, state.activeLivestreams || {}, action.data);
|
2022-04-15 12:46:46 +02:00
|
|
|
return {
|
|
|
|
...state,
|
|
|
|
activeLivestreams,
|
|
|
|
activeLivestreamInitialized: true,
|
|
|
|
viewersById: updateViewersById(activeLivestreams, state.viewersById),
|
|
|
|
};
|
2021-12-16 22:59:13 +01:00
|
|
|
},
|
2022-01-06 18:49:49 +01:00
|
|
|
[ACTIONS.REMOVE_CHANNEL_FROM_ACTIVE_LIVESTREAMS]: (state: LivestreamState, action: any) => {
|
2021-12-22 17:12:44 +01:00
|
|
|
const activeLivestreams = state.activeLivestreams;
|
|
|
|
if (activeLivestreams) delete activeLivestreams[action.data.channelId];
|
|
|
|
return { ...state, activeLivestreams: Object.assign({}, activeLivestreams), activeLivestreamInitialized: true };
|
2021-12-16 22:59:13 +01:00
|
|
|
},
|
2022-04-29 15:54:14 +02:00
|
|
|
[ACTIONS.SOCKET_CONNECTED_BY_ID]: (state: LivestreamState, action: any) => {
|
|
|
|
const { connected, sub_category, id: claimId } = action.data;
|
|
|
|
|
|
|
|
const socketConnectionById = Object.assign({}, state.socketConnectionById);
|
|
|
|
socketConnectionById[claimId] = { connected, sub_category };
|
|
|
|
|
|
|
|
return { ...state, socketConnectionById };
|
|
|
|
},
|
2021-04-23 05:04:11 +02:00
|
|
|
},
|
|
|
|
defaultState
|
|
|
|
);
|