refactor(YouTube - Litho filter): Simplify debug logging code

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java

@@ -177,10 +177,7 @@ public final class AdsFilter extends Filter {
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == playerShoppingShelf) {
-            if (contentIndex == 0 && playerShoppingShelfBuffer.check(protobufBufferArray).isFiltered()) {
+            return contentIndex == 0 && playerShoppingShelfBuffer.check(protobufBufferArray).isFiltered();
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-            return false;
         }
 
         // Check for the index because of likelihood of false positives.
@@ -198,13 +195,10 @@ public final class AdsFilter extends Filter {
         }
 
         if (matchedGroup == channelProfile) {
-            if (visitStoreButton.check(protobufBufferArray).isFiltered()) {
+            return visitStoreButton.check(protobufBufferArray).isFiltered();
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-            return false;
         }
 
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        return true;
     }
 
     /**

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java

@@ -99,29 +99,23 @@ final class ButtonsFilter extends Filter {
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == likeSubscribeGlow) {
-            if ((path.startsWith(VIDEO_ACTION_BAR_PATH_PREFIX) || path.startsWith(COMPACT_CHANNEL_BAR_PATH_PREFIX))
+            return (path.startsWith(VIDEO_ACTION_BAR_PATH_PREFIX) || path.startsWith(COMPACT_CHANNEL_BAR_PATH_PREFIX))
-                    && path.contains(ANIMATED_VECTOR_TYPE_PATH)) {
+                    && path.contains(ANIMATED_VECTOR_TYPE_PATH);
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
         }
 
         // If the current matched group is the action bar group,
         // in case every filter group is enabled, hide the action bar.
         if (matchedGroup == actionBarGroup) {
-            if (!isEveryFilterGroupEnabled()) {
+            return isEveryFilterGroupEnabled();
-                return false;
-            }
-        } else if (matchedGroup == bufferFilterPathGroup) {
-            // Make sure the current path is the right one
-            //  to avoid false positives.
-            if (!path.startsWith(VIDEO_ACTION_BAR_PATH)) return false;
-
-            // In case the group list has no match, return false.
-            if (!bufferButtonsGroupList.check(protobufBufferArray).isFiltered()) return false;
         }
 
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        if (matchedGroup == bufferFilterPathGroup) {
+            // Make sure the current path is the right one
+            //  to avoid false positives.
+            return path.startsWith(VIDEO_ACTION_BAR_PATH)
+                    && bufferButtonsGroupList.check(protobufBufferArray).isFiltered();
+        }
+
+        return true;
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java

@@ -88,22 +88,15 @@ final class CommentsFilter extends Filter {
         if (matchedGroup == commentComposer) {
             // To completely hide the emoji buttons (and leave no empty space), the timestamp button is
             // also hidden because the buffer is exactly the same and there's no way selectively hide.
-            if (contentIndex == 0
+            return contentIndex == 0
                     && path.endsWith(TIMESTAMP_OR_EMOJI_BUTTONS_ENDS_WITH_PATH)
-                    && emojiPickerBufferGroup.check(protobufBufferArray).isFiltered()) {
+                    && emojiPickerBufferGroup.check(protobufBufferArray).isFiltered();
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
         }
 
         if (matchedGroup == filterChipBar) {
-            if (aiCommentsSummary.check(protobufBufferArray).isFiltered()) {
+            return aiCommentsSummary.check(protobufBufferArray).isFiltered();
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-            return false;
         }
 
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        return true;
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CustomFilter.java

@@ -153,9 +153,11 @@ final class CustomFilter extends Filter {
         if (custom.startsWith && contentIndex != 0) {
             return false;
         }
-        if (custom.bufferSearch != null && !custom.bufferSearch.matches(protobufBufferArray)) {
+
-            return false;
+        if (custom.bufferSearch == null) {
+            return true; // No buffer filter, only path filtering.
         }
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+
+        return custom.bufferSearch.matches(protobufBufferArray);
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java

@@ -94,13 +94,9 @@ final class DescriptionComponentsFilter extends Filter {
         if (exceptions.matches(path)) return false;
 
         if (matchedGroup == macroMarkersCarousel) {
-            if (contentIndex == 0 && macroMarkersCarouselGroupList.check(protobufBufferArray).isFiltered()) {
+            return contentIndex == 0 && macroMarkersCarouselGroupList.check(protobufBufferArray).isFiltered();
-                return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
         }
 
-        return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        return true;
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java

@@ -6,9 +6,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.BaseSettings;
-
 /**
  * Filters litho based components.
  *
@@ -62,10 +59,7 @@ abstract class Filter {
      * Called after an enabled filter has been matched.
      * Default implementation is to always filter the matched component and log the action.
      * Subclasses can perform additional or different checks if needed.
-     * <p>
+     *
-     * If the content is to be filtered, subclasses should always
-     * call this method (and never return a plain 'true').
-     * That way the logs will always show when a component was filtered and which filter hide it.
      * <p>
      * Method is called off the main thread.
      *
@@ -76,14 +70,6 @@ abstract class Filter {
      */
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-        if (BaseSettings.DEBUG.get()) {
-            String filterSimpleName = getClass().getSimpleName();
-            if (contentType == FilterContentType.IDENTIFIER) {
-                Logger.printDebug(() -> filterSimpleName + " Filtered identifier: " + identifier);
-            } else {
-                Logger.printDebug(() -> filterSimpleName + " Filtered path: " + path);
-            }
-        }
         return true;
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/KeywordContentFilter.java

@@ -576,7 +576,7 @@ final class KeywordContentFilter extends Filter {
         MutableReference<String> matchRef = new MutableReference<>();
         if (bufferSearch.matches(protobufBufferArray, matchRef)) {
             updateStats(true, matchRef.value);
-            return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+            return true;
         }
 
         updateStats(false, null);

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java

@@ -286,43 +286,29 @@ public final class LayoutComponentsFilter extends Filter {
         // From 2025, the medical information panel is no longer shown in the search results.
         // Therefore, this identifier does not filter when the search bar is activated.
         if (matchedGroup == singleItemInformationPanel) {
-            if (PlayerType.getCurrent().isMaximizedOrFullscreen() || !NavigationBar.isSearchBarActive()) {
+            return PlayerType.getCurrent().isMaximizedOrFullscreen() || !NavigationBar.isSearchBarActive();
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
         }
 
         // The groups are excluded from the filter due to the exceptions list below.
         // Filter them separately here.
-        if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey || matchedGroup == expandableMetadata)
+        if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey || matchedGroup == expandableMetadata) {
-        {
+            return true;
-            return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
         }
 
         if (exceptions.matches(path)) return false; // Exceptions are not filtered.
 
         if (matchedGroup == compactChannelBarInner) {
-            if (compactChannelBarInnerButton.check(path).isFiltered()) {
+            return compactChannelBarInnerButton.check(path).isFiltered()
-                // The filter may be broad, but in the context of a compactChannelBarInnerButton,
+                    // The filter may be broad, but in the context of a compactChannelBarInnerButton,
-                // it's safe to assume that the button is the only thing that should be hidden.
+                    // it's safe to assume that the button is the only thing that should be hidden.
-                if (joinMembershipButton.check(protobufBufferArray).isFiltered()) {
+                    && joinMembershipButton.check(protobufBufferArray).isFiltered();
-                    return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-                }
-            }
-
-            return false;
         }
 
         if (matchedGroup == horizontalShelves) {
-            if (contentIndex == 0 && hideShelves()) {
+            return contentIndex == 0 && hideShelves();
-                return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
         }
 
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        return true;
     }
 
     /**

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LithoFilterPatch.java

@@ -7,6 +7,7 @@ import java.nio.ByteBuffer;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.youtube.StringTrieSearch;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -114,12 +115,29 @@ public final class LithoFilterPatch {
             if (!group.includeInSearch()) {
                 continue;
             }
+
             for (String pattern : group.filters) {
-                pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex, matchedLength, callbackParameter) -> {
+                String filterSimpleName = filter.getClass().getSimpleName();
+
+                pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex,
+                                                    matchedLength, callbackParameter) -> {
                             if (!group.isEnabled()) return false;
+
                             LithoFilterParameters parameters = (LithoFilterParameters) callbackParameter;
-                            return filter.isFiltered(parameters.identifier, parameters.path, parameters.protoBuffer,
+                            final boolean isFiltered = filter.isFiltered(parameters.identifier,
-                                    group, type, matchedStartIndex);
+                                    parameters.path, parameters.protoBuffer, group, type, matchedStartIndex);
+
+                            if (isFiltered && BaseSettings.DEBUG.get()) {
+                                if (type == Filter.FilterContentType.IDENTIFIER) {
+                                    Logger.printDebug(() -> "Filtered " + filterSimpleName
+                                            + " identifier: " + parameters.identifier);
+                                } else {
+                                    Logger.printDebug(() -> "Filtered " + filterSimpleName
+                                            + " path: " + parameters.path);
+                                }
+                            }
+
+                            return isFiltered;
                         }
                 );
             }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java

@@ -99,7 +99,7 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == videoQualityMenuFooter) {
-            return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+            return true;
         }
 
         if (contentIndex != 0) {
@@ -111,11 +111,6 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
             return false;
         }
 
-        if (flyoutFilterGroupList.check(protobufBufferArray).isFiltered()) {
+        return flyoutFilterGroupList.check(protobufBufferArray).isFiltered();
-            // Super class handles logging.
-            return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-        }
-
-        return false;
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java

@@ -278,27 +278,18 @@ public final class ShortsFilter extends Filter {
         if (contentType == FilterContentType.PATH) {
             if (matchedGroup == subscribeButton || matchedGroup == joinButton || matchedGroup == paidPromotionButton) {
                 // Selectively filter to avoid false positive filtering of other subscribe/join buttons.
-                if (path.startsWith(REEL_CHANNEL_BAR_PATH) || path.startsWith(REEL_METAPANEL_PATH)) {
+                return path.startsWith(REEL_CHANNEL_BAR_PATH) || path.startsWith(REEL_METAPANEL_PATH);
-                    return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-                }
-                return false;
             }
 
             if (matchedGroup == shortsCompactFeedVideoPath) {
-                if (shouldHideShortsFeedItems() && shortsCompactFeedVideoBuffer.check(protobufBufferArray).isFiltered()) {
+                return shouldHideShortsFeedItems() && shortsCompactFeedVideoBuffer.check(protobufBufferArray).isFiltered();
-                    return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-                }
-                return false;
             }
 
             // Video action buttons (comment, share, remix) have the same path.
             // Like and dislike are separate path filters and don't require buffer searching.
             if (matchedGroup == shortsActionBar) {
-                if (actionButton.check(path).isFiltered()
+                return actionButton.check(path).isFiltered()
-                        && videoActionButtonGroupList.check(protobufBufferArray).isFiltered()) {
+                        && videoActionButtonGroupList.check(protobufBufferArray).isFiltered();
-                    return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-                }
-                return false;
             }
 
             if (matchedGroup == suggestedAction) {
@@ -306,28 +297,23 @@ public final class ShortsFilter extends Filter {
                 // This has a secondary effect of hiding all new un-identified actions
                 // under the assumption that the user wants all suggestions hidden.
                 if (isEverySuggestedActionFilterEnabled()) {
-                    return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
+                    return true;
                 }
 
-                if (suggestedActionsGroupList.check(protobufBufferArray).isFiltered()) {
+                return suggestedActionsGroupList.check(protobufBufferArray).isFiltered();
-                    return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-                }
-                return false;
             }
 
-        } else {
+            return true;
-            // Feed/search identifier components.
-            if (matchedGroup == shelfHeader) {
-                // Because the header is used in watch history and possibly other places, check for the index,
-                // which is 0 when the shelf header is used for Shorts.
-                if (contentIndex != 0) return false;
-            }
-
-            if (!shouldHideShortsFeedItems()) return false;
         }
 
-        // Super class handles logging.
+        // Feed/search identifier components.
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        if (matchedGroup == shelfHeader) {
+            // Because the header is used in watch history and possibly other places, check for the index,
+            // which is 0 when the shelf header is used for Shorts.
+            if (contentIndex != 0) return false;
+        }
+
+        return shouldHideShortsFeedItems();
     }
 
     private static boolean shouldHideShortsFeedItems() {