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

fix context not checked for warnings

Browse Source 
closes sk22#518
This commit is contained in:
sk
2023-05-25 21:25:09 +02:00
parent 07f4ef1697
commit 220cd35d82
12 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ public class StatusFilterPredicate implements Predicate<Status>{
filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(context)).collect(Collectors.toList());
}
// TODO: rewrite (see testHasStatusWarning) and generalize
@Override
public boolean test(Status status){
if(status.filtered!=null){
@@ -39,21 +40,19 @@ public class StatusFilterPredicate implements Predicate<Status>{
return true;
}
public boolean testWithWarning(Status status) {
if(status.filtered!=null){
if (status.filtered.isEmpty()){
return true;
}
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.WARN);
return !matches;
// TODO: move this method elsewhere; it's not part of the actual StatusFilterPredicate
public boolean testHasStatusWarning(Status status, Filter.FilterContext context) {
if (status.filtered != null) {
// use server-provided info on whether this status was filtered
if (status.filtered.isEmpty()) return false;
return status.filtered.stream()
.map(filterResult -> filterResult.filter)
.filter(filter -> filter.expiresAt == null || filter.expiresAt.isAfter(Instant.now()))
.filter(filter -> filter.context.contains(context))
.anyMatch(filter -> filter.filterAction == Filter.FilterAction.WARN);
} else {
// look through local filters instead
return filters.stream().anyMatch(filter -> filter.matches(status));
}
for(Filter filter:filters){
if(filter.matches(status))
return false;
}
return true;
}
}