Now the filter context finally makes sense!
This commit is contained in:
parent
e223bdd2bd
commit
0ee99fa709
|
@ -105,7 +105,7 @@ public abstract class StatusDisplayItem{
|
||||||
StatusFilterPredicate filterPredicate = new StatusFilterPredicate(filters);
|
StatusFilterPredicate filterPredicate = new StatusFilterPredicate(filters);
|
||||||
|
|
||||||
if(!statusForContent.filterRevealed){
|
if(!statusForContent.filterRevealed){
|
||||||
statusForContent.filterRevealed = filterPredicate.testWithWarning(status);
|
statusForContent.filterRevealed = filterPredicate.testWithWarning(status, filterContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class StatusFilterPredicate implements Predicate<Status>{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean testWithWarning(Status status) {
|
public boolean testWithWarning(Status status, Filter.FilterContext filterContext) {
|
||||||
if(status.filtered!=null){
|
if(status.filtered!=null){
|
||||||
if (status.filtered.isEmpty()){
|
if (status.filtered.isEmpty()){
|
||||||
return true;
|
return true;
|
||||||
|
@ -47,7 +47,7 @@ public class StatusFilterPredicate implements Predicate<Status>{
|
||||||
boolean matches=status.filtered.stream()
|
boolean matches=status.filtered.stream()
|
||||||
.map(filterResult->filterResult.filter)
|
.map(filterResult->filterResult.filter)
|
||||||
.filter(filter->filter.expiresAt==null||filter.expiresAt.isAfter(Instant.now()))
|
.filter(filter->filter.expiresAt==null||filter.expiresAt.isAfter(Instant.now()))
|
||||||
.anyMatch(filter->filter.filterAction==Filter.FilterAction.WARN);
|
.anyMatch(filter->filter.filterAction==Filter.FilterAction.WARN && filter.context.contains(filterContext));
|
||||||
return !matches;
|
return !matches;
|
||||||
}
|
}
|
||||||
for(Filter filter:filters){
|
for(Filter filter:filters){
|
||||||
|
|
Loading…
Reference in New Issue