fix(YouTube): Resolve UI components not hiding for some users (#6054)

Author: LisoUseInAIKyrios

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java

@@ -131,11 +131,11 @@ private static CharSequence onLithoTextLoaded(@NonNull Object conversionContext,
 
             String conversionContextString = conversionContext.toString();
 
-            if (isRollingNumber && !conversionContextString.contains("video_action_bar.eml")) {
+            if (isRollingNumber && !conversionContextString.contains("video_action_bar.e")) {
                 return original;
             }
 
-            if (conversionContextString.contains("segmented_like_dislike_button.eml")) {
+            if (conversionContextString.contains("segmented_like_dislike_button.e")) {
                 // Regular video.
                 ReturnYouTubeDislike videoData = currentVideoData;
                 if (videoData == null) {
@@ -153,12 +153,12 @@ private static CharSequence onLithoTextLoaded(@NonNull Object conversionContext,
             }
 
             if (Utils.containsAny(conversionContextString,
-                    "|shorts_dislike_button.eml", "|reel_dislike_button.eml")) {
+                    "|shorts_dislike_button.e", "|reel_dislike_button.e")) {
                 return getShortsSpan(original, true);
             }
 
             if (Utils.containsAny(conversionContextString,
-                    "|shorts_like_button.eml", "|reel_like_button.eml")) {
+                    "|shorts_like_button.e", "|reel_like_button.e")) {
                 if (!Utils.containsNumber(original)) {
                     Logger.printDebug(() -> "Replacing hidden likes count");
                     return getShortsSpan(original, false);

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

@@ -105,17 +105,17 @@ public AdsFilter() {
                 Settings.HIDE_VIEW_PRODUCTS_BANNER,
                 "product_item",
                 "products_in_video",
-                "shopping_overlay.eml" // Video player overlay shopping links.
+                "shopping_overlay.e" // Video player overlay shopping links.
         );
 
         final var shoppingLinks = new StringFilterGroup(
                 Settings.HIDE_SHOPPING_LINKS,
-                "shopping_description_shelf.eml"
+                "shopping_description_shelf.e"
         );
 
         playerShoppingShelf = new StringFilterGroup(
                 Settings.HIDE_CREATOR_STORE_SHELF,
-                "horizontal_shelf.eml"
+                "horizontal_shelf.e"
         );
 
         playerShoppingShelfBuffer = new ByteArrayFilterGroup(
@@ -131,7 +131,7 @@ public AdsFilter() {
         final var merchandise = new StringFilterGroup(
                 Settings.HIDE_MERCHANDISE_BANNERS,
                 "product_carousel",
-                "shopping_carousel.eml" // Channel profile shopping shelf.
+                "shopping_carousel.e" // Channel profile shopping shelf.
         );
 
         final var selfSponsor = new StringFilterGroup(

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

@@ -14,7 +14,7 @@ public final class AdvancedVideoQualityMenuFilter extends Filter {
     public AdvancedVideoQualityMenuFilter() {
         addPathCallbacks(new StringFilterGroup(
                 Settings.ADVANCED_VIDEO_QUALITY_MENU,
-                "quick_quality_sheet_content.eml-js"
+                "quick_quality_sheet_content.e"
         ));
     }
 

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

@@ -4,13 +4,13 @@
 
 @SuppressWarnings("unused")
 final class ButtonsFilter extends Filter {
-    private static final String COMPACT_CHANNEL_BAR_PATH_PREFIX = "compact_channel_bar.eml";
-    private static final String VIDEO_ACTION_BAR_PATH_PREFIX = "video_action_bar.eml";
-    private static final String VIDEO_ACTION_BAR_PATH = "video_action_bar.eml";
+    private static final String COMPACT_CHANNEL_BAR_PATH_PREFIX = "compact_channel_bar.e";
+    private static final String VIDEO_ACTION_BAR_PATH_PREFIX = "video_action_bar.e";
+    private static final String VIDEO_ACTION_BAR_PATH = "video_action_bar.e";
     /**
      * Video bar path when the video information is collapsed. Seems to shown only with 20.14+
      */
-    private static final String COMPACTIFY_VIDEO_ACTION_BAR_PATH = "compactify_video_action_bar.eml";
+    private static final String COMPACTIFY_VIDEO_ACTION_BAR_PATH = "compactify_video_action_bar.e";
     private static final String ANIMATED_VECTOR_TYPE_PATH = "AnimatedVectorType";
 
     private final StringFilterGroup likeSubscribeGlow;
@@ -28,12 +28,12 @@ public ButtonsFilter() {
 
         likeSubscribeGlow = new StringFilterGroup(
                 Settings.DISABLE_LIKE_SUBSCRIBE_GLOW,
-                "animated_button_border.eml"
+                "animated_button_border.e"
         );
 
         bufferFilterPathGroup = new StringFilterGroup(
                 null,
-                "|ContainerType|button.eml"
+                "|ContainerType|button.e"
         );
 
         addPathCallbacks(
@@ -45,15 +45,15 @@ public ButtonsFilter() {
                 ),
                 new StringFilterGroup(
                         Settings.HIDE_DOWNLOAD_BUTTON,
-                        "|download_button.eml"
+                        "|download_button.e"
                 ),
                 new StringFilterGroup(
                         Settings.HIDE_SAVE_BUTTON,
                         "|save_to_playlist_button"
                 ),
                 new StringFilterGroup(
                         Settings.HIDE_CLIP_BUTTON,
-                        "|clip_button.eml"
+                        "|clip_button.e"
                 )
         );
 

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

@@ -6,7 +6,7 @@
 @SuppressWarnings("unused")
 final class CommentsFilter extends Filter {
 
-    private static final String COMMENT_COMPOSER_PATH = "comment_composer.eml";
+    private static final String COMMENT_COMPOSER_PATH = "comment_composer.e";
 
     private final StringFilterGroup chipBar;
     private final ByteArrayFilterGroup aiCommentsSummary;
@@ -15,12 +15,12 @@ final class CommentsFilter extends Filter {
     public CommentsFilter() {
         var chatSummary = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_AI_CHAT_SUMMARY,
-                "live_chat_summary_banner.eml"
+                "live_chat_summary_banner.e"
         );
 
         chipBar = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_AI_SUMMARY,
-                "chip_bar.eml"
+                "chip_bar.e"
         );
 
         aiCommentsSummary = new ByteArrayFilterGroup(
@@ -35,8 +35,8 @@ public CommentsFilter() {
 
         var commentsByMembers = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_BY_MEMBERS_HEADER,
-                "sponsorships_comments_header.eml",
-                "sponsorships_comments_footer.eml"
+                "sponsorships_comments_header.e",
+                "sponsorships_comments_footer.e"
         );
 
         var comments = new StringFilterGroup(
@@ -52,7 +52,7 @@ public CommentsFilter() {
 
         var createAShort = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_CREATE_A_SHORT_BUTTON,
-                "composer_short_creation_button.eml"
+                "composer_short_creation_button.e"
         );
 
         emojiAndTimestampButtons = new StringFilterGroup(
@@ -69,7 +69,7 @@ public CommentsFilter() {
 
         var thanksButton = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_THANKS_BUTTON,
-                "super_thanks_button.eml"
+                "super_thanks_button.e"
         );
 
         addPathCallbacks(

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

@@ -29,12 +29,12 @@ public DescriptionComponentsFilter() {
 
         aiGeneratedVideoSummarySection = new StringFilterGroup(
                 Settings.HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION,
-                "cell_expandable_metadata.eml"
+                "cell_expandable_metadata.e"
         );
 
         final StringFilterGroup askSection = new StringFilterGroup(
                 Settings.HIDE_ASK_SECTION,
-                "youchat_entrypoint.eml"
+                "youchat_entrypoint.e"
         );
 
         final StringFilterGroup attributesSection = new StringFilterGroup(
@@ -65,7 +65,7 @@ public DescriptionComponentsFilter() {
 
         macroMarkersCarousel = new StringFilterGroup(
                 null,
-                "macro_markers_carousel.eml"
+                "macro_markers_carousel.e"
         );
 
         macroMarkersCarouselGroupList.addAll(
@@ -81,7 +81,7 @@ public DescriptionComponentsFilter() {
 
         horizontalShelf = new StringFilterGroup(
                 Settings.HIDE_ATTRIBUTES_SECTION,
-                "horizontal_shelf.eml"
+                "horizontal_shelf.e"
         );
 
         cellVideoAttribute = new ByteArrayFilterGroup(

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

@@ -9,7 +9,7 @@ public HideInfoCardsFilter() {
         addIdentifierCallbacks(
                 new StringFilterGroup(
                         Settings.HIDE_INFO_CARDS,
-                        "info_card_teaser_overlay.eml"
+                        "info_card_teaser_overlay.e"
                 )
         );
     }

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

@@ -79,10 +79,10 @@ final class KeywordContentFilter extends Filter {
             "search_vwc_description_transition_key",
             "g-high-recZ",
             // Text and litho components found in the buffer that belong to path filters.
-            "expandable_metadata.eml",
-            "thumbnail.eml",
-            "avatar.eml",
-            "overflow_button.eml",
+            "expandable_metadata.e",
+            "thumbnail.e",
+            "avatar.e",
+            "overflow_button.e",
             "shorts-lockup-image",
             "shorts-lockup.overlay-metadata.secondary-text",
             "YouTubeSans-SemiBold",
@@ -94,16 +94,16 @@ final class KeywordContentFilter extends Filter {
      */
     private final StringFilterGroup startsWithFilter = new StringFilterGroup(
             null, // Multiple settings are used and must be individually checked if active.
-            "home_video_with_context.eml",
-            "search_video_with_context.eml",
-            "video_with_context.eml", // Subscription tab videos.
-            "related_video_with_context.eml",
+            "home_video_with_context.e",
+            "search_video_with_context.e",
+            "video_with_context.e", // Subscription tab videos.
+            "related_video_with_context.e",
             // A/B test for subscribed video, and sometimes when tablet layout is enabled.
-            "video_lockup_with_attachment.eml",
-            "compact_video.eml",
+            "video_lockup_with_attachment.e",
+            "compact_video.e",
             "inline_shorts",
             "shorts_video_cell",
-            "shorts_pivot_item.eml"
+            "shorts_pivot_item.e"
     );
 
     /**
@@ -112,9 +112,9 @@ final class KeywordContentFilter extends Filter {
     @SuppressWarnings("FieldCanBeLocal")
     private final StringFilterGroup containsFilter = new StringFilterGroup(
             null,
-            "modern_type_shelf_header_content.eml",
-            "shorts_lockup_cell.eml", // Part of 'shorts_shelf_carousel.eml'
-            "video_card.eml" // Shorts that appear in a horizontal shelf.
+            "modern_type_shelf_header_content.e",
+            "shorts_lockup_cell.e", // Part of 'shorts_shelf_carousel.e'
+            "video_card.e" // Shorts that appear in a horizontal shelf.
     );
 
     /**
@@ -125,10 +125,10 @@ final class KeywordContentFilter extends Filter {
      * the buffer of the parent component was already searched and passed.
      */
     private final StringTrieSearch exceptions = new StringTrieSearch(
-            "metadata.eml",
-            "thumbnail.eml",
-            "avatar.eml",
-            "overflow_button.eml"
+            "metadata.e",
+            "thumbnail.e",
+            "avatar.e",
+            "overflow_button.e"
     );
 
     /**

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

@@ -76,18 +76,18 @@ public LayoutComponentsFilter() {
         communityPosts = new StringFilterGroup(
                 Settings.HIDE_COMMUNITY_POSTS,
                 "post_base_wrapper", // may be obsolete and no longer needed.
-                "text_post_root.eml",
-                "images_post_root.eml",
-                "images_post_slim.eml", // may be obsolete and no longer needed.
-                "images_post_root_slim.eml",
-                "text_post_root_slim.eml",
-                "post_base_wrapper_slim.eml",
-                "poll_post_root.eml",
-                "videos_post_root.eml",
-                "post_shelf_slim.eml",
-                "videos_post_responsive_root.eml",
-                "text_post_responsive_root.eml",
-                "poll_post_responsive_root.eml"
+                "text_post_root.e",
+                "images_post_root.e",
+                "images_post_slim.e", // may be obsolete and no longer needed.
+                "images_post_root_slim.e",
+                "text_post_root_slim.e",
+                "post_base_wrapper_slim.e",
+                "poll_post_root.e",
+                "videos_post_root.e",
+                "post_shelf_slim.e",
+                "videos_post_responsive_root.e",
+                "text_post_responsive_root.e",
+                "poll_post_responsive_root.e"
         );
 
         final var subscribersCommunityGuidelines = new StringFilterGroup(
@@ -149,7 +149,7 @@ public LayoutComponentsFilter() {
 
         final var channelLinksPreview = new StringFilterGroup(
                 Settings.HIDE_LINKS_PREVIEW,
-                "attribution.eml"
+                "attribution.e"
         );
 
         final var emergencyBox = new StringFilterGroup(
@@ -190,8 +190,8 @@ public LayoutComponentsFilter() {
 
         final var playables = new StringFilterGroup(
                 Settings.HIDE_PLAYABLES,
-                "horizontal_gaming_shelf.eml",
-                "mini_game_card.eml"
+                "horizontal_gaming_shelf.e",
+                "mini_game_card.e"
         );
 
         // Playable horizontal shelf header.
@@ -228,7 +228,7 @@ public LayoutComponentsFilter() {
 
         compactChannelBarInnerButton = new StringFilterGroup(
                 null,
-                "|button.eml"
+                "|button.e"
         );
 
         joinMembershipButton = new ByteArrayFilterGroup(
@@ -248,13 +248,13 @@ public LayoutComponentsFilter() {
 
         final var videoRecommendationLabels = new StringFilterGroup(
                 Settings.HIDE_VIDEO_RECOMMENDATION_LABELS,
-                "endorsement_header_footer.eml"
+                "endorsement_header_footer.e"
         );
 
         channelProfile = new StringFilterGroup(
                 null,
-                "channel_profile.eml",
-                "page_header.eml"
+                "channel_profile.e",
+                "page_header.e"
         );
         channelProfileBuffer = new ByteArrayFilterGroupList();
         channelProfileBuffer.addAll(new ByteArrayFilterGroup(
@@ -269,15 +269,15 @@ public LayoutComponentsFilter() {
 
         horizontalShelves = new StringFilterGroup(
                 Settings.HIDE_HORIZONTAL_SHELVES,
-                "horizontal_video_shelf.eml",
-                "horizontal_shelf.eml",
-                "horizontal_shelf_inline.eml",
-                "horizontal_tile_shelf.eml"
+                "horizontal_video_shelf.e",
+                "horizontal_shelf.e",
+                "horizontal_shelf_inline.e",
+                "horizontal_tile_shelf.e"
         );
 
         ticketShelf = new ByteArrayFilterGroup(
                 Settings.HIDE_TICKET_SHELF,
-                "ticket_item.eml"
+                "ticket_item.e"
         );
 
         addPathCallbacks(

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

@@ -24,13 +24,13 @@ public PlaybackSpeedMenuFilter() {
         // 0.05x litho speed menu.
         var playbackRateSelectorGroup = new StringFilterGroup(
                 Settings.CUSTOM_SPEED_MENU,
-                "playback_rate_selector_menu_sheet.eml-js"
+                "playback_rate_selector_menu_sheet.e"
         );
 
         // Old litho based speed menu.
         oldPlaybackMenuGroup = new StringFilterGroup(
                 Settings.CUSTOM_SPEED_MENU,
-                "playback_speed_sheet_content.eml-js");
+                "playback_speed_sheet_content.e");
 
         addPathCallbacks(playbackRateSelectorGroup, oldPlaybackMenuGroup);
     }