From e6a4f81b78a6830a20a8b19bfe1cbd6943a12a01 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Fri, 12 Apr 2024 14:39:33 -0300 Subject: [PATCH] fix(client-filters): readd the necessary logic for them to work again --- .../android/ui/displayitems/StatusDisplayItem.java | 7 +++++++ .../joinmastodon/android/utils/StatusFilterPredicate.java | 2 ++ 2 files changed, 9 insertions(+) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java index 4afa8dbe3..835eaba66 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java @@ -240,6 +240,13 @@ public abstract class StatusDisplayItem{ break; } } + + // Moshidon + if(applyingFilter==null){ + StatusFilterPredicate predicate = new StatusFilterPredicate(accountID, filterContext, FilterAction.WARN); + predicate.test(status); + applyingFilter = predicate.getApplyingFilter(); + } } ArrayList contentItems; 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 7d4652f79..2529dcf64 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java +++ b/mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java @@ -24,6 +24,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; +// TODO: This whole class has been ditched upstream. I plan to eventually refactor it to only have the still relevant clientFilters code + public class StatusFilterPredicate implements Predicate{ private final List clientFilters; private final List filters;