From 4586fbc34b16e8540c29c2802e254864b1f19f8e Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Thu, 26 Aug 2021 11:50:57 -0400 Subject: [PATCH] Revert "Fix stream type for livestreams (#6967)" (#6972) This reverts commit ee609c654f8bcc7d3b66450633fa55fbe81c280f. --- ui/component/claimListDiscover/view.jsx | 9 ++------- ui/component/claimTilesDiscover/view.jsx | 1 - ui/util/search.js | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ui/component/claimListDiscover/view.jsx b/ui/component/claimListDiscover/view.jsx index 987d76183..42a2557da 100644 --- a/ui/component/claimListDiscover/view.jsx +++ b/ui/component/claimListDiscover/view.jsx @@ -72,7 +72,6 @@ type Props = { liveLivestreamsFirst?: boolean, livestreamMap?: { [string]: any }, hasSource?: boolean, - hasNoSource?: boolean, limitClaimsPerChannel?: number, releaseTime?: string, showNoSourceClaims?: boolean, @@ -134,7 +133,6 @@ function ClaimListDiscover(props: Props) { liveLivestreamsFirst, livestreamMap, hasSource, - hasNoSource, isChannel = false, showNoSourceClaims, empty, @@ -246,10 +244,7 @@ function ClaimListDiscover(props: Props) { : CS.ORDER_BY_TOP_VALUE, // Sort by top }; - if (ENABLE_NO_SOURCE_CLAIMS && hasNoSource) { - options.has_no_source = true; - options.claim_type = ['stream']; - } else if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === 'stream'))) { + if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === CS.CLAIM_STREAM))) { options.has_source = true; } @@ -633,7 +628,7 @@ function ClaimListDiscover(props: Props) { liveLivestreamsFirst={liveLivestreamsFirst} livestreamMap={livestreamMap} searchOptions={options} - showNoSourceClaims={hasNoSource || showNoSourceClaims} + showNoSourceClaims={showNoSourceClaims} empty={empty} /> {loading && diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx index 1dce1edff..c915aa275 100644 --- a/ui/component/claimTilesDiscover/view.jsx +++ b/ui/component/claimTilesDiscover/view.jsx @@ -203,7 +203,6 @@ function ClaimTilesDiscover(props: Props) { if (ENABLE_NO_SOURCE_CLAIMS && hasNoSource) { options.has_no_source = true; - options.claim_type = ['stream']; } else if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === 'stream'))) { options.has_source = true; } diff --git a/ui/util/search.js b/ui/util/search.js index b65b68db2..3839b4d6f 100644 --- a/ui/util/search.js +++ b/ui/util/search.js @@ -34,7 +34,6 @@ export function getLivestreamOnlyOptions(options: any) { delete newOptions.has_source; delete newOptions.stream_types; newOptions.has_no_source = true; - newOptions.claim_type = ['stream']; return newOptions; }