Revert "Fix stream type for livestreams" #6972

Merged
tzarebczan merged 1 commit from revert-6967-fix-livestream-claim-type into master 2021-08-26 17:50:57 +02:00
3 changed files with 2 additions and 9 deletions
Showing only changes of commit 730055d9a4 - Show all commits

View file

@ -72,7 +72,6 @@ type Props = {
liveLivestreamsFirst?: boolean, liveLivestreamsFirst?: boolean,
livestreamMap?: { [string]: any }, livestreamMap?: { [string]: any },
hasSource?: boolean, hasSource?: boolean,
hasNoSource?: boolean,
limitClaimsPerChannel?: number, limitClaimsPerChannel?: number,
releaseTime?: string, releaseTime?: string,
showNoSourceClaims?: boolean, showNoSourceClaims?: boolean,
@ -134,7 +133,6 @@ function ClaimListDiscover(props: Props) {
liveLivestreamsFirst, liveLivestreamsFirst,
livestreamMap, livestreamMap,
hasSource, hasSource,
hasNoSource,
isChannel = false, isChannel = false,
showNoSourceClaims, showNoSourceClaims,
empty, empty,
@ -246,10 +244,7 @@ function ClaimListDiscover(props: Props) {
: CS.ORDER_BY_TOP_VALUE, // Sort by top : CS.ORDER_BY_TOP_VALUE, // Sort by top
}; };
if (ENABLE_NO_SOURCE_CLAIMS && hasNoSource) { if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === CS.CLAIM_STREAM))) {
options.has_no_source = true;
options.claim_type = ['stream'];
} else if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === 'stream'))) {
options.has_source = true; options.has_source = true;
} }
@ -633,7 +628,7 @@ function ClaimListDiscover(props: Props) {
liveLivestreamsFirst={liveLivestreamsFirst} liveLivestreamsFirst={liveLivestreamsFirst}
livestreamMap={livestreamMap} livestreamMap={livestreamMap}
searchOptions={options} searchOptions={options}
showNoSourceClaims={hasNoSource || showNoSourceClaims} showNoSourceClaims={showNoSourceClaims}
empty={empty} empty={empty}
/> />
{loading && {loading &&

View file

@ -203,7 +203,6 @@ function ClaimTilesDiscover(props: Props) {
if (ENABLE_NO_SOURCE_CLAIMS && hasNoSource) { if (ENABLE_NO_SOURCE_CLAIMS && hasNoSource) {
options.has_no_source = true; options.has_no_source = true;
options.claim_type = ['stream'];
} else if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === 'stream'))) { } else if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === 'stream'))) {
options.has_source = true; options.has_source = true;
} }

View file

@ -34,7 +34,6 @@ export function getLivestreamOnlyOptions(options: any) {
delete newOptions.has_source; delete newOptions.has_source;
delete newOptions.stream_types; delete newOptions.stream_types;
newOptions.has_no_source = true; newOptions.has_no_source = true;
newOptions.claim_type = ['stream'];
return newOptions; return newOptions;
} }