Livestreams: fixes related to 'excludedChannelIds' #2936

OdyseeTeam · Aug 23, 2023 · d1c5676 · d1c5676
2 parents bd92ac6 + 168b487
commit d1c5676
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/ui/page/discover/view.jsx b/ui/page/discover/view.jsx
@@ -97,7 +97,7 @@ function DiscoverPage(props: Props) {
         <LivestreamSection
           tileLayout={repostedUri ? false : tileLayout}
           channelIds={channelIds}
-          excludedChannelIds={excludedChannelIds}
+          excludedChannelIds={isWildWest ? excludedChannelIds : null}
           searchLanguages={dynamicRouteProps?.options?.searchLanguages}
           langParam={langParam}
           hideMembersOnlyContent={hideMembersOnlyContent}

diff --git a/ui/page/home/view.jsx b/ui/page/home/view.jsx
@@ -124,12 +124,13 @@ function HomePage(props: Props) {
         }
         // -- Find livestreams related to the category:
         const rowChannelIds = row.options?.channelIds;
+        const rowExcludedChannelIds = row.options?.excludedChannelIds;
         cache[row.id] = {
           livestreamUris:
             row.id === 'FOLLOWING'
-              ? filterActiveLivestreamUris(subscribedChannelIds, null, al, lv)
+              ? filterActiveLivestreamUris(subscribedChannelIds, rowExcludedChannelIds, al, lv)
               : rowChannelIds
-              ? filterActiveLivestreamUris(rowChannelIds, null, al, lv)
+              ? filterActiveLivestreamUris(rowChannelIds, rowExcludedChannelIds, al, lv)
               : null,
         };
       });

diff --git a/ui/redux/selectors/livestream.js b/ui/redux/selectors/livestream.js
@@ -67,10 +67,11 @@ export const selectFilteredActiveLivestreamUris = createCachedSelector(
       const activeCreatorLivestream = activeLivestreamByCreatorId[creatorId];
 
       if (activeCreatorLivestream) {
-        const channelShouldFilter = !channelIds || channelIds.includes(creatorId);
-        const channelShouldExclude = excludedChannelIds && !excludedChannelIds.includes(creatorId);
+        const shouldInclude =
+          (!channelIds || channelIds.includes(creatorId)) &&
+          (!excludedChannelIds || !excludedChannelIds.includes(creatorId));
 
-        if (channelShouldFilter || channelShouldExclude) {
+        if (shouldInclude) {
           filteredLivestreams.push(activeCreatorLivestream);
         }
       }

diff --git a/ui/util/livestream.js b/ui/util/livestream.js
@@ -103,23 +103,6 @@ export function filterActiveLivestreamUris(
 
   const filtered: Array<LivestreamActiveClaim> = [];
 
-  for (const creatorId in activeLivestreamByCreatorId) {
-    const activeLivestream = activeLivestreamByCreatorId[creatorId];
-    if (activeLivestream) {
-      if (channelIds) {
-        if (channelIds.includes(creatorId)) {
-          if (excludedChannelIds && !excludedChannelIds.includes(creatorId)) {
-            filtered.push(activeLivestream);
-          }
-        }
-      } else {
-        if (excludedChannelIds && !excludedChannelIds.includes(creatorId)) {
-          filtered.push(activeLivestream);
-        }
-      }
-    }
-  }
-
   for (const creatorId in activeLivestreamByCreatorId) {
     const activeLivestream = activeLivestreamByCreatorId[creatorId];
     if (activeLivestream) {