feat(youtube/general-ads): hide shorts in search

Author: oSumAtrIX

app/src/main/java/app/revanced/integrations/patches/LithoFilterPatch.java

@@ -76,7 +76,8 @@ public BlockResult check(final String string) {
 }
 
 abstract class Filter {
-    final LithoBlockRegister register = new LithoBlockRegister();
+    final LithoBlockRegister pathRegister = new LithoBlockRegister();
+    final LithoBlockRegister identifierRegister = new LithoBlockRegister();
 
     abstract boolean filter(final String path, final String identifier);
 }
@@ -140,15 +141,15 @@ public CommentsPatch() {
                 "comments_entry_point_simplebox"
         );
 
-        this.register.registerAll(
+        this.pathRegister.registerAll(
                 comments,
                 previewComment
         );
     }
 
     @Override
     boolean filter(String path, String _identifier) {
-        if (!Extensions.any(register, path)) return false;
+        if (!Extensions.any(pathRegister, path)) return false;
 
         LogHelper.debug(CommentsPatch.class, "Blocked: " + path);
 
@@ -173,7 +174,7 @@ public ButtonsPatch() {
 
         actionBarRule = new BlockRule(null, "video_action_bar");
 
-        this.register.registerAll(
+        this.pathRegister.registerAll(
                 like,
                 dislikeRule,
                 download,
@@ -201,7 +202,7 @@ public boolean filter(final String path, final String identifier) {
             } else return false;
         }
 
-        if ((currentIsActionButton && ActionButton.doNotBlockCounter <= 0 && actionButtonsRule.isEnabled()) || Extensions.any(register, path)) {
+        if ((currentIsActionButton && ActionButton.doNotBlockCounter <= 0 && actionButtonsRule.isEnabled()) || Extensions.any(pathRegister, path)) {
             LogHelper.debug(ButtonsPatch.class, "Blocked: " + path);
             return true;
         } else return false;
@@ -213,8 +214,6 @@ static class ActionButton {
 }
 
 final class GeneralBytecodeAdsPatch extends Filter {
-    private final BlockRule identifierBlock;
-
     public GeneralBytecodeAdsPatch() {
         var communityPosts = new BlockRule(SettingsEnum.ADREMOVER_COMMUNITY_POSTS_REMOVAL, "post_base_wrapper");
         var communityGuidelines = new BlockRule(SettingsEnum.ADREMOVER_COMMUNITY_GUIDELINES_REMOVAL, "community_guidelines");
@@ -223,7 +222,6 @@ public GeneralBytecodeAdsPatch() {
         var medicalPanel = new BlockRule(SettingsEnum.ADREMOVER_MEDICAL_PANEL_REMOVAL, "medical_panel");
         var paidContent = new BlockRule(SettingsEnum.ADREMOVER_PAID_CONTENT_REMOVAL, "paid_content_overlay");
         var merchandise = new BlockRule(SettingsEnum.ADREMOVER_MERCHANDISE_REMOVAL, "product_carousel");
-        var shorts = new BlockRule(SettingsEnum.ADREMOVER_SHORTS_SHELF_REMOVAL, "shorts_shelf");
         var infoPanel = new BlockRule(SettingsEnum.ADREMOVER_INFO_PANEL_REMOVAL, "publisher_transparency_panel", "single_item_information_panel");
         var suggestions = new BlockRule(SettingsEnum.ADREMOVER_SUGGESTIONS_REMOVAL, "horizontal_video_shelf");
         var latestPosts = new BlockRule(SettingsEnum.ADREMOVER_HIDE_LATEST_POSTS, "post_shelf");
@@ -241,7 +239,6 @@ public GeneralBytecodeAdsPatch() {
                 "banner_text_icon",
                 "cell_divider",
                 "reels_player_overlay",
-                "shelf_header",
                 "watch_metadata_app_promo",
                 "video_display_full_layout"
         );
@@ -253,11 +250,10 @@ public GeneralBytecodeAdsPatch() {
                 "movie_and_show_upsell_card"
         );
 
-        this.register.registerAll(
+        this.pathRegister.registerAll(
                 generalAds,
                 communityPosts,
                 paidContent,
-                shorts,
                 suggestions,
                 latestPosts,
                 movieAds,
@@ -272,8 +268,13 @@ public GeneralBytecodeAdsPatch() {
                 selfSponsor
         );
 
-        // Block for the ComponentContext.identifier field
-        identifierBlock = new BlockRule(SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL, "carousel_ad");
+        var carouselAd = new BlockRule(SettingsEnum.ADREMOVER_GENERAL_ADS_REMOVAL, "carousel_ad");
+        var shorts = new BlockRule(SettingsEnum.ADREMOVER_SHORTS_REMOVAL, "shorts_shelf", "inline_shorts");
+
+        this.identifierRegister.registerAll(
+                shorts,
+                carouselAd
+        );
     }
 
     public boolean filter(final String path, final String identifier) {
@@ -293,10 +294,10 @@ public boolean filter(final String path, final String identifier) {
                 "playlist_add_to_option_wrapper" // do not block on "add to playlist" flyout menu
         )) return false;
 
-        if (!Extensions.any(register, path) && !identifierBlock.check(identifier).isBlocked())
+        if (!(Extensions.any(pathRegister, path) || Extensions.any(identifierRegister, identifier)))
             return false;
 
-        LogHelper.debug(GeneralBytecodeAdsPatch.class, "Blocked: " + path);
+        LogHelper.debug(GeneralBytecodeAdsPatch.class, String.format("Blocked (ID: %s): %s", identifier, path));
 
         return true;
     }

app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java

@@ -35,7 +35,7 @@ public enum SettingsEnum {
     ADREMOVER_COMPACT_BANNER_REMOVAL("revanced_adremover_compact_banner_removal", true, ReturnType.BOOLEAN),
     ADREMOVER_MOVIE_REMOVAL("revanced_adremover_movie", true, ReturnType.BOOLEAN),
     ADREMOVER_FEED_SURVEY_REMOVAL("revanced_adremover_feed_survey", true, ReturnType.BOOLEAN),
-    ADREMOVER_SHORTS_SHELF_REMOVAL("revanced_adremover_shorts_shelf", true, ReturnType.BOOLEAN),
+    ADREMOVER_SHORTS_REMOVAL("revanced_adremover_shorts", true, ReturnType.BOOLEAN),
     ADREMOVER_COMMUNITY_GUIDELINES_REMOVAL("revanced_adremover_community_guidelines", true, ReturnType.BOOLEAN),
     ADREMOVER_EMERGENCY_BOX_REMOVAL("revanced_adremover_emergency_box_removal", true, ReturnType.BOOLEAN),
     ADREMOVER_INFO_PANEL_REMOVAL("revanced_adremover_info_panel", true, ReturnType.BOOLEAN),