fix context not checked for warnings

closes sk22#518

mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java

@@ -118,4 +118,10 @@ public class AccountTimelineFragment extends StatusListFragment{
 	protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
 		// no-op
 	}
+
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.ACCOUNT;
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetBookmarkedStatuses;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
 
@@ -35,4 +36,9 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.ACCOUNT;
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetFavoritedStatuses;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
 
@@ -35,4 +36,9 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.ACCOUNT;
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java

@@ -280,4 +280,9 @@ public class HomeTimelineFragment extends StatusListFragment {
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.HOME;
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java

@@ -162,4 +162,10 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
     protected void onSetFabBottomInset(int inset) {
         ((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
     }
+
+
+    @Override
+    protected Filter.FilterContext getFilterContext() {
+        return Filter.FilterContext.HOME;
+    }
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -34,7 +34,11 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		boolean addFooter = !GlobalUserPreferences.spectatorMode ||
 				(this instanceof ThreadFragment t && s.id.equals(t.mainStatus.id));
-		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, addFooter, null, Filter.FilterContext.HOME);
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, addFooter, null, getFilterContext());
+	}
+
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.PUBLIC;
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java

@@ -181,4 +181,10 @@ public class ThreadFragment extends StatusListFragment{
 	public boolean wantsLightNavigationBar(){
 		return !UiUtils.isDarkTheme();
 	}
+
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.THREAD;
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/model/Filter.java

@@ -15,9 +15,7 @@ import java.util.regex.Pattern;
 
 @Parcel
 public class Filter extends BaseModel{
-	@RequiredField
 	public String id;
-	@RequiredField
 	public String phrase;
 	public String title;
 	public transient EnumSet<FilterContext> context=EnumSet.noneOf(FilterContext.class);

mastodon/src/main/java/org/joinmastodon/android/model/FilterResult.java

@@ -1,8 +1,15 @@
 package org.joinmastodon.android.model;
 
+import org.joinmastodon.android.api.ObjectValidationException;
 import org.parceler.Parcel;
 
 @Parcel
 public class FilterResult extends BaseModel {
     public Filter filter;
+
+    @Override
+    public void postprocess() throws ObjectValidationException {
+        super.postprocess();
+        if (filter != null) filter.postprocess();
+    }
 }

mastodon/src/main/java/org/joinmastodon/android/model/Status.java

@@ -101,6 +101,9 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 			card.postprocess();
 		if(reblog!=null)
 			reblog.postprocess();
+		if(filtered!=null)
+			for(FilterResult fr : filtered)
+				fr.postprocess();
 
 		spoilerRevealed=GlobalUserPreferences.alwaysExpandContentWarnings || !sensitive;
 		if (visibility.equals(StatusPrivacy.LOCAL)) localOnly = true;

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

@@ -107,7 +107,7 @@ public abstract class StatusDisplayItem{
 		StatusFilterPredicate filterPredicate = new StatusFilterPredicate(filters);
 
 		if(!statusForContent.filterRevealed){
-			statusForContent.filterRevealed = filterPredicate.testWithWarning(status);
+			statusForContent.filterRevealed = !filterPredicate.testHasStatusWarning(status, filterContext);
 		}
 
 		ReblogOrReplyLineStatusDisplayItem replyLine = null;

mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java

@@ -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) {
+	// TODO: move this method elsewhere; it's not part of the actual StatusFilterPredicate
-		if(status.filtered!=null){
+	public boolean testHasStatusWarning(Status status, Filter.FilterContext context) {
-			if (status.filtered.isEmpty()){
+		if (status.filtered != null) {
-				return true;
+			// use server-provided info on whether this status was filtered
-			}
+			if (status.filtered.isEmpty()) return false;
-			boolean matches=status.filtered.stream()
+			return 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);
+					.filter(filter -> filter.context.contains(context))
-			return !matches;
+					.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;
 	}
 }