owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(client-filters): readd the necessary logic for them to work again

Browse Source
This commit is contained in:
LucasGGamerM
2024-04-12 14:39:33 -03:00
parent 038923bf8f
commit e6a4f81b78
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
View File

@@ -240,6 +240,13 @@ public abstract class StatusDisplayItem{
break; break;
} }
} }
// Moshidon
if(applyingFilter==null){
StatusFilterPredicate predicate = new StatusFilterPredicate(accountID, filterContext, FilterAction.WARN);
predicate.test(status);
applyingFilter = predicate.getApplyingFilter();
}
} }
ArrayList<StatusDisplayItem> contentItems; ArrayList<StatusDisplayItem> contentItems;

2
mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
View File

@@ -24,6 +24,8 @@ import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; 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<Status>{ public class StatusFilterPredicate implements Predicate<Status>{
private final List<LegacyFilter> clientFilters; private final List<LegacyFilter> clientFilters;
private final List<LegacyFilter> filters; private final List<LegacyFilter> filters;