From ea8a4ae48777b1b7e251520aab3ce3aeb7450984 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Sat, 28 Jan 2023 15:05:42 -0300 Subject: [PATCH] It now completely hides posts which have filters with warnings applied to them --- .../src/main/java/org/joinmastodon/android/model/Status.java | 2 ++ .../org/joinmastodon/android/utils/StatusFilterPredicate.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java index 99ec54ac3..74770e073 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java @@ -60,6 +60,8 @@ public class Status extends BaseModel implements DisplayItemsParent{ public transient boolean spoilerRevealed; public transient boolean hasGapAfter; + + public transient boolean showFiltered = true; private transient String strippedText; @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java b/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java index 4555cdfdb..ee8f55d4c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java +++ b/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java @@ -29,7 +29,7 @@ public class StatusFilterPredicate implements Predicate{ boolean matches=status.filtered.stream() .map(filterResult->filterResult.filter) .filter(filter->filter.expiresAt==null||filter.expiresAt.isAfter(Instant.now())) - .anyMatch(filter->filter.filterAction==Filter.FilterAction.HIDE); + .anyMatch(filter->filter.filterAction==Filter.FilterAction.HIDE || filter.filterAction==Filter.FilterAction.WARN); return !matches; } for(Filter filter:filters){