ReVanced-Mirror/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2024-12-01 00:02:55 +01:00
Code Issues Projects Releases Wiki Activity

fix(YouTube - Hide shorts components): Do not prevent filtering components

Browse Source 
Previously, the exceptions group prevented filtering the "Notify me" button and in feed surveys.
This commit is contained in:
oSumAtrIX 2023-10-06 02:36:27 +02:00
parent ed6571734e
commit 6eb301776e
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/app/revanced/integrations/patches/components/LayoutComponentsFilter.java
View File

@ -20,14 +20,16 @@ public final class LayoutComponentsFilter extends Filter {
"&list=" "&list="
); );
private final StringFilterGroup searchResultShelfHeader; private final StringFilterGroup searchResultShelfHeader;
private final StringFilterGroup inFeedSurvey;
private final StringFilterGroup notifyMe;
@RequiresApi(api = Build.VERSION_CODES.N) @RequiresApi(api = Build.VERSION_CODES.N)
public LayoutComponentsFilter() { public LayoutComponentsFilter() {
exceptions.addPatterns( exceptions.addPatterns(
"home_video_with_context", "home_video_with_context",
"related_video_with_context", "related_video_with_context",
"comment_thread", // skip filtering anything in the comments "comment_thread", // Whitelist comments
"|comment.", // skip filtering anything in the comments replies "|comment.", // Whitelist comment replies
"library_recent_shelf" "library_recent_shelf"
); );
@ -62,7 +64,7 @@ public final class LayoutComponentsFilter extends Filter {
"compact_banner" "compact_banner"
); );
final var inFeedSurvey = new StringFilterGroup( inFeedSurvey = new StringFilterGroup(
SettingsEnum.HIDE_FEED_SURVEY, SettingsEnum.HIDE_FEED_SURVEY,
"in_feed_survey", "in_feed_survey",
"slimline_survey" "slimline_survey"
@ -158,7 +160,7 @@ public final class LayoutComponentsFilter extends Filter {
"shelf_header.eml" "shelf_header.eml"
); );
final var notifyMe = new StringFilterGroup( notifyMe = new StringFilterGroup(
SettingsEnum.HIDE_NOTIFY_ME_BUTTON, SettingsEnum.HIDE_NOTIFY_ME_BUTTON,
"set_reminder_button" "set_reminder_button"
); );
@ -208,6 +210,9 @@ public final class LayoutComponentsFilter extends Filter {
@Override @Override
public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray, public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) { FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey) return true;
if (matchedGroup != custom && exceptions.matches(path)) if (matchedGroup != custom && exceptions.matches(path))
return false; // Exceptions are not filtered. return false; // Exceptions are not filtered.