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

Livestream fetch: add language option

Browse source 
The function argument order can be a bit ugly, but putting it at the back as optional param makes it easier to test without affecting existing clients.
This commit is contained in:
infinite-persistence 2022-02-24 19:46:04 +08:00 committed by Thomas Zarebczan
parent c6d8687cfa
commit a14239a9dc
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ui/redux/actions/livestream.js
View file

@ -87,7 +87,7 @@ const filterUpcomingLiveStreamClaims = (upcomingClaims) => {
return startingSoonClaims; return startingSoonClaims;
}; };
const fetchUpcomingLivestreamClaims = (channelIds: Array<string>) => { const fetchUpcomingLivestreamClaims = (channelIds: Array<string>, lang: ?Array<string> = null) => {
return doClaimSearch( return doClaimSearch(
{ {
page: 1, page: 1,
@ -99,6 +99,7 @@ const fetchUpcomingLivestreamClaims = (channelIds: Array<string>) => {
release_time: `>${moment().subtract(5, 'minutes').unix()}`, release_time: `>${moment().subtract(5, 'minutes').unix()}`,
limit_claims_per_channel: 1, limit_claims_per_channel: 1,
no_totals: true, no_totals: true,
...(lang ? { any_languages: lang } : {}),
}, },
{ {
useAutoPagination: true, useAutoPagination: true,
@ -106,7 +107,11 @@ const fetchUpcomingLivestreamClaims = (channelIds: Array<string>) => {
); );
}; };
const fetchMostRecentLivestreamClaims = (channelIds: Array<string>, orderBy: Array<string> = ['release_time']) => { const fetchMostRecentLivestreamClaims = (
channelIds: Array<string>,
orderBy: Array<string> = ['release_time'],
lang: ?Array<string> = null
) => {
return doClaimSearch( return doClaimSearch(
{ {
page: 1, page: 1,
@ -118,6 +123,7 @@ const fetchMostRecentLivestreamClaims = (channelIds: Array<string>, orderBy: Arr
release_time: `<${moment().unix()}`, release_time: `<${moment().unix()}`,
limit_claims_per_channel: 2, limit_claims_per_channel: 2,
no_totals: true, no_totals: true,
...(lang ? { any_languages: lang } : {}),
}, },
{ {
useAutoPagination: true, useAutoPagination: true,
@ -154,14 +160,20 @@ const determineLiveClaim = (claims: any, activeLivestreams: any) => {
return activeClaims; return activeClaims;
}; };
const findActiveStreams = async (channelIDs: Array<string>, orderBy: Array<string>, liveChannels: any, dispatch) => { const findActiveStreams = async (
channelIDs: Array<string>,
orderBy: Array<string>,
liveChannels: any,
dispatch,
lang: ?Array<string> = null
) => {
// @Note: This can likely be simplified down to one query, but first we'll need to address the query limit / pagination issue. // @Note: This can likely be simplified down to one query, but first we'll need to address the query limit / pagination issue.
// Find the two most recent claims for the channels that are actively broadcasting a stream. // Find the two most recent claims for the channels that are actively broadcasting a stream.
const mostRecentClaims = await dispatch(fetchMostRecentLivestreamClaims(channelIDs, orderBy)); const mostRecentClaims = await dispatch(fetchMostRecentLivestreamClaims(channelIDs, orderBy, lang));
// Find the first upcoming claim (if one exists) for each channel that's actively broadcasting a stream. // Find the first upcoming claim (if one exists) for each channel that's actively broadcasting a stream.
const upcomingClaims = await dispatch(fetchUpcomingLivestreamClaims(channelIDs)); const upcomingClaims = await dispatch(fetchUpcomingLivestreamClaims(channelIDs, lang));
// Filter out any of those claims that aren't scheduled to start within the configured "soon" buffer time (ex. next 5 min). // Filter out any of those claims that aren't scheduled to start within the configured "soon" buffer time (ex. next 5 min).
const startingSoonClaims = filterUpcomingLiveStreamClaims(upcomingClaims); const startingSoonClaims = filterUpcomingLiveStreamClaims(upcomingClaims);
@ -200,14 +212,14 @@ export const doFetchChannelLiveStatus = (channelId: string) => {
}; };
}; };
export const doFetchActiveLivestreams = (orderBy: Array<string> = ['release_time']) => { export const doFetchActiveLivestreams = (orderBy: Array<string> = ['release_time'], lang: ?Array<string> = null) => {
return async (dispatch: Dispatch, getState: GetState) => { return async (dispatch: Dispatch, getState: GetState) => {
const state = getState(); const state = getState();
const now = Date.now(); const now = Date.now();
const timeDelta = now - state.livestream.activeLivestreamsLastFetchedDate; const timeDelta = now - state.livestream.activeLivestreamsLastFetchedDate;
const prevOptions = state.livestream.activeLivestreamsLastFetchedOptions; const prevOptions = state.livestream.activeLivestreamsLastFetchedOptions;
const nextOptions = { order_by: orderBy }; const nextOptions = { order_by: orderBy, ...(lang ? { any_languages: lang } : {}) };
const sameOptions = JSON.stringify(prevOptions) === JSON.stringify(nextOptions); const sameOptions = JSON.stringify(prevOptions) === JSON.stringify(nextOptions);
if (sameOptions && timeDelta < FETCH_ACTIVE_LIVESTREAMS_MIN_INTERVAL_MS) { if (sameOptions && timeDelta < FETCH_ACTIVE_LIVESTREAMS_MIN_INTERVAL_MS) {
@ -221,7 +233,13 @@ export const doFetchActiveLivestreams = (orderBy: Array<string> = ['release_time
const liveChannels = await fetchLiveChannels(); const liveChannels = await fetchLiveChannels();
const liveChannelIds = Object.keys(liveChannels); const liveChannelIds = Object.keys(liveChannels);
const currentlyLiveClaims = await findActiveStreams(liveChannelIds, nextOptions.order_by, liveChannels, dispatch); const currentlyLiveClaims = await findActiveStreams(
liveChannelIds,
nextOptions.order_by,
liveChannels,
dispatch,
nextOptions.any_languages
);
Object.values(currentlyLiveClaims).forEach((claim: any) => { Object.values(currentlyLiveClaims).forEach((claim: any) => {
const channelId = claim.stream.signing_channel.claim_id; const channelId = claim.stream.signing_channel.claim_id;