From 0732b8ceda67cb5ffdcbbc30b17700cf5bcd5dff Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Sat, 27 Jul 2024 17:19:18 +0900
Subject: [PATCH] fix(YouTube - Hide feed components): `Hide carousel shelf`
 setting sometimes hides the Watch history in the You tab

---
 .../components/FeedComponentsFilter.java        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/FeedComponentsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/FeedComponentsFilter.java
index 677838cdb6..d13e0061f2 100644
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/FeedComponentsFilter.java
+++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/FeedComponentsFilter.java
@@ -4,12 +4,11 @@
 
 import androidx.annotation.Nullable;
 
-import org.apache.commons.lang3.StringUtils;
-
 import app.revanced.integrations.shared.patches.components.ByteArrayFilterGroup;
 import app.revanced.integrations.shared.patches.components.Filter;
 import app.revanced.integrations.shared.patches.components.StringFilterGroup;
 import app.revanced.integrations.shared.patches.components.StringFilterGroupList;
+import app.revanced.integrations.shared.utils.Logger;
 import app.revanced.integrations.shared.utils.StringTrieSearch;
 import app.revanced.integrations.youtube.settings.Settings;
 import app.revanced.integrations.youtube.shared.RootView;
@@ -225,17 +224,17 @@ private static boolean hideShelves() {
             return true;
         }
 
+        NavigationButton selectedNavButton = NavigationButton.getSelectedNavigationButton();
+        if (selectedNavButton != null && !selectedNavButton.isLibraryOrYouTab()) {
+            return true;
+        }
+
         // Check browseId last.
         // Only filter in home feed, search results, playlist.
         final String browseId = RootView.getBrowseId();
+        Logger.printInfo(() -> "browseId: " + browseId);
 
-        if (StringUtils.startsWithAny(browseId, BROWSE_ID_DEFAULT, BROWSE_ID_PLAYLIST)) {
-            return true;
-        } else if (browseId.isEmpty()) {
-            NavigationButton selectedNavButton = NavigationButton.getSelectedNavigationButton();
-            return selectedNavButton != null && !selectedNavButton.isLibraryOrYouTab();
-        }
-        return false;
+        return browseId.startsWith(BROWSE_ID_PLAYLIST);
     }
 
     @Override