0143b63c74
- Instead of 2 ways to display ads (DOM injection + React method) and having both of them clash, just do it the predictable React way. - Augment the existing React version to support tile layout + ability to place in last visible slot. - Consolidate styling code to scss ... DOM manipulations were making it even harder to maintain. - Removed the need to check for ad-blockers for now. It was being executed every time an ad is displayed, and now that we are displaying ads in more places, the gains doesn't justify the performance loss. Also, it wasn't being done for Recommended ads anyway, so the inconsistency probably means it's not needed in the first place. Other known issues fixed: - double ad injection when changing language via nag. - additional "total-blocking-time" due to ads at startup removed. - fixed ads not appearing in mobile homepage until navigated away and back to homepage. - enable ads in channel page. - support for both List and Tile layout.
222 lines
7.5 KiB
JavaScript
222 lines
7.5 KiB
JavaScript
// @flow
|
|
import { SHOW_ADS, SIMPLE_SITE } from 'config';
|
|
import * as CS from 'constants/claim_search';
|
|
import * as ICONS from 'constants/icons';
|
|
import React, { Fragment } from 'react';
|
|
import HiddenNsfwClaims from 'component/hiddenNsfwClaims';
|
|
import { useHistory } from 'react-router-dom';
|
|
import Button from 'component/button';
|
|
import ClaimListDiscover from 'component/claimListDiscover';
|
|
import Ads from 'web/component/ads';
|
|
import Icon from 'component/common/icon';
|
|
import LivestreamLink from 'component/livestreamLink';
|
|
import { Form, FormField } from 'component/common/form';
|
|
import { DEBOUNCE_WAIT_DURATION_MS } from 'constants/search';
|
|
import { lighthouse } from 'redux/actions/search';
|
|
import ScheduledStreams from 'component/scheduledStreams';
|
|
|
|
const TYPES_TO_ALLOW_FILTER = ['stream', 'repost'];
|
|
|
|
type Props = {
|
|
uri: string,
|
|
totalPages: number,
|
|
fetching: boolean,
|
|
params: { page: number },
|
|
pageOfClaimsInChannel: Array<StreamClaim>,
|
|
channelIsBlocked: boolean,
|
|
channelIsMine: boolean,
|
|
fetchClaims: (string, number) => void,
|
|
channelIsBlackListed: boolean,
|
|
defaultPageSize?: number,
|
|
defaultInfiniteScroll?: Boolean,
|
|
claim: Claim,
|
|
isAuthenticated: boolean,
|
|
showMature: boolean,
|
|
tileLayout: boolean,
|
|
viewHiddenChannels: boolean,
|
|
doResolveUris: (Array<string>, boolean) => void,
|
|
claimType: string,
|
|
empty?: string,
|
|
doFetchChannelLiveStatus: (string) => void,
|
|
activeLivestreamForChannel: any,
|
|
activeLivestreamInitialized: boolean,
|
|
};
|
|
|
|
function ChannelContent(props: Props) {
|
|
const {
|
|
uri,
|
|
fetching,
|
|
channelIsMine,
|
|
channelIsBlocked,
|
|
channelIsBlackListed,
|
|
claim,
|
|
isAuthenticated,
|
|
defaultPageSize = CS.PAGE_SIZE,
|
|
defaultInfiniteScroll = true,
|
|
showMature,
|
|
tileLayout,
|
|
viewHiddenChannels,
|
|
doResolveUris,
|
|
claimType,
|
|
empty,
|
|
doFetchChannelLiveStatus,
|
|
activeLivestreamForChannel,
|
|
activeLivestreamInitialized,
|
|
} = props;
|
|
// const claimsInChannel = (claim && claim.meta.claims_in_channel) || 0;
|
|
const claimsInChannel = 9999;
|
|
const [searchQuery, setSearchQuery] = React.useState('');
|
|
const [searchResults, setSearchResults] = React.useState(undefined);
|
|
const {
|
|
location: { pathname, search },
|
|
} = useHistory();
|
|
const url = `${pathname}${search}`;
|
|
const claimId = claim && claim.claim_id;
|
|
const isChannelEmpty = !claim || !claim.meta;
|
|
const showFilters =
|
|
!claimType ||
|
|
(Array.isArray(claimType)
|
|
? claimType.every((ct) => TYPES_TO_ALLOW_FILTER.includes(ct))
|
|
: TYPES_TO_ALLOW_FILTER.includes(claimType));
|
|
|
|
function handleInputChange(e) {
|
|
const { value } = e.target;
|
|
setSearchQuery(value);
|
|
}
|
|
|
|
React.useEffect(() => {
|
|
const timer = setTimeout(() => {
|
|
if (searchQuery.trim().length < 3 || !claimId) {
|
|
// In order to display original search results, search results must be set to null. A query of '' should display original results.
|
|
return setSearchResults(null);
|
|
} else {
|
|
lighthouse
|
|
.search(
|
|
`s=${encodeURIComponent(searchQuery)}&channel_id=${encodeURIComponent(claimId)}${
|
|
!showMature ? '&nsfw=false&size=50&from=0' : ''
|
|
}`
|
|
)
|
|
.then(({ body: results }) => {
|
|
const urls = results.map(({ name, claimId }) => {
|
|
return `lbry://${name}#${claimId}`;
|
|
});
|
|
|
|
// Batch-resolve the urls before calling 'setSearchResults', as the
|
|
// latter will immediately cause the tiles to resolve, ending up
|
|
// calling doResolveUri one by one before the batched one.
|
|
doResolveUris(urls, true);
|
|
|
|
setSearchResults(urls);
|
|
})
|
|
.catch(() => {
|
|
setSearchResults(null);
|
|
});
|
|
}
|
|
}, DEBOUNCE_WAIT_DURATION_MS);
|
|
return () => clearTimeout(timer);
|
|
}, [claimId, searchQuery, showMature, doResolveUris]);
|
|
|
|
React.useEffect(() => {
|
|
setSearchQuery('');
|
|
setSearchResults(null);
|
|
}, [url]);
|
|
|
|
const isInitialized = Boolean(activeLivestreamForChannel) || activeLivestreamInitialized;
|
|
const isChannelBroadcasting = Boolean(activeLivestreamForChannel);
|
|
|
|
// Find out current channels status + active live claim.
|
|
React.useEffect(() => {
|
|
doFetchChannelLiveStatus(claimId);
|
|
const intervalId = setInterval(() => doFetchChannelLiveStatus(claimId), 30000);
|
|
return () => clearInterval(intervalId);
|
|
}, [claimId, doFetchChannelLiveStatus]);
|
|
|
|
const showScheduledLiveStreams = claimType !== 'collection'; // ie. not on the playlist page.
|
|
|
|
return (
|
|
<Fragment>
|
|
{!fetching && Boolean(claimsInChannel) && !channelIsBlocked && !channelIsBlackListed && (
|
|
<HiddenNsfwClaims uri={uri} />
|
|
)}
|
|
|
|
{!fetching && isInitialized && isChannelBroadcasting && !isChannelEmpty && (
|
|
<LivestreamLink claimUri={activeLivestreamForChannel.claimUri} />
|
|
)}
|
|
|
|
{!fetching && showScheduledLiveStreams && (
|
|
<ScheduledStreams
|
|
channelIds={[claimId]}
|
|
tileLayout={tileLayout}
|
|
liveUris={
|
|
isChannelBroadcasting && activeLivestreamForChannel.claimUri ? [activeLivestreamForChannel.claimUri] : []
|
|
}
|
|
showHideSetting={false}
|
|
/>
|
|
)}
|
|
|
|
{!fetching && channelIsBlackListed && (
|
|
<section className="card card--section">
|
|
<p>
|
|
{__(
|
|
'In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this channel from our applications. Content may also be blocked due to DMCA Red Flag rules which are obvious copyright violations we come across, are discussed in public channels, or reported to us.'
|
|
)}
|
|
</p>
|
|
<div className="section__actions">
|
|
<Button button="link" href="https://odysee.com/@OdyseeHelp:b/copyright:f" label={__('Read More')} />
|
|
</div>
|
|
</section>
|
|
)}
|
|
|
|
{!fetching && channelIsBlocked && (
|
|
<div className="card--section">
|
|
<h2 className="help">{__('You have blocked this channel content.')}</h2>
|
|
</div>
|
|
)}
|
|
|
|
{!channelIsMine && claimsInChannel > 0 && <HiddenNsfwClaims uri={uri} />}
|
|
|
|
{!fetching && (
|
|
<ClaimListDiscover
|
|
ignoreSearchInLanguage
|
|
hasSource
|
|
defaultFreshness={CS.FRESH_ALL}
|
|
showHiddenByUser={viewHiddenChannels}
|
|
forceShowReposts
|
|
fetchViewCount
|
|
hideFilters={!showFilters}
|
|
hideAdvancedFilter={!showFilters}
|
|
tileLayout={tileLayout}
|
|
uris={searchResults}
|
|
streamType={SIMPLE_SITE ? CS.CONTENT_ALL : undefined}
|
|
channelIds={[claimId]}
|
|
claimType={claimType}
|
|
feeAmount={CS.FEE_AMOUNT_ANY}
|
|
defaultOrderBy={CS.ORDER_BY_NEW}
|
|
pageSize={defaultPageSize}
|
|
infiniteScroll={defaultInfiniteScroll}
|
|
injectedItem={SHOW_ADS && !isAuthenticated && { node: <Ads type="video" tileLayout={tileLayout} small /> }}
|
|
meta={
|
|
showFilters && (
|
|
<Form onSubmit={() => {}} className="wunderbar--inline">
|
|
<Icon icon={ICONS.SEARCH} />
|
|
<FormField
|
|
name="channel_search"
|
|
className="wunderbar__input--inline"
|
|
value={searchQuery}
|
|
onChange={handleInputChange}
|
|
type="text"
|
|
placeholder={__('Search')}
|
|
/>
|
|
</Form>
|
|
)
|
|
}
|
|
isChannel
|
|
channelIsMine={channelIsMine}
|
|
empty={empty}
|
|
/>
|
|
)}
|
|
</Fragment>
|
|
);
|
|
}
|
|
|
|
export default ChannelContent;
|