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

fix: fix hide with a warning posts without alt text

Browse Source
This commit is contained in:
LucasGGamerM
2023-08-29 08:20:11 -03:00
parent 7c3b4128de
commit 17a59b5db4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
public class StatusFilterPredicate implements Predicate<Status>{ public class StatusFilterPredicate implements Predicate<Status>{
private List<LegacyFilter> clientFilters; private final List<LegacyFilter> clientFilters;
private final List<LegacyFilter> filters; private final List<LegacyFilter> filters;
private final FilterContext context; private final FilterContext context;
private final FilterAction action; private final FilterAction action;
@@ -40,7 +40,7 @@ public class StatusFilterPredicate implements Predicate<Status>{
this.context = context; this.context = context;
this.action = action; this.action = action;
this.clientFilters = GlobalUserPreferences.showPostsWithoutAlt ? List.of() this.clientFilters = GlobalUserPreferences.showPostsWithoutAlt ? List.of()
: List.of(new AltTextFilter(HIDE, HOME, PUBLIC, ACCOUNT), new AltTextFilter(WARN, THREAD, NOTIFICATIONS)); : List.of(new AltTextFilter(WARN, HOME, PUBLIC, ACCOUNT, THREAD, NOTIFICATIONS));
} }
public StatusFilterPredicate(List<LegacyFilter> filters, FilterContext context){ public StatusFilterPredicate(List<LegacyFilter> filters, FilterContext context){
@@ -56,6 +56,8 @@ public class StatusFilterPredicate implements Predicate<Status>{
filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(context)).collect(Collectors.toList()); filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(context)).collect(Collectors.toList());
this.context = context; this.context = context;
this.action = action; this.action = action;
this.clientFilters = GlobalUserPreferences.showPostsWithoutAlt ? List.of()
: List.of(new AltTextFilter(WARN, HOME, PUBLIC, ACCOUNT, THREAD, NOTIFICATIONS));
} }
/** /**
@@ -91,8 +93,7 @@ public class StatusFilterPredicate implements Predicate<Status>{
.findAny(); .findAny();
//Apply client filters if no server filter is triggered //Apply client filters if no server filter is triggered
if (applyingFilter.isEmpty() && clientFilters != null) { if (applyingFilter.isEmpty() && !clientFilters.isEmpty()) {
System.out.println("It got here");
applyingFilter = clientFilters.stream() applyingFilter = clientFilters.stream()
.filter(filter -> filter.context.contains(context)) .filter(filter -> filter.context.contains(context))
.filter(filter -> filter.filterAction == null ? action == HIDE : filter.filterAction == action) .filter(filter -> filter.filterAction == null ? action == HIDE : filter.filterAction == action)