From 129ce09c9f5166487a69736c77deee374d30ec1d Mon Sep 17 00:00:00 2001
From: LucasGGamerM <moshidon.app@gmail.com>
Date: Sat, 11 May 2024 14:49:13 -0300
Subject: [PATCH] fix(get-client-filters): only add client filters if status is
 not previously filtered

---
 .../android/ui/displayitems/StatusDisplayItem.java           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index 9d5e5dbb8b..9ac9d86b45 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -228,7 +228,10 @@ public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?>
 		LegacyFilter applyingFilter=null;
 		if(status.filtered!=null){
 			List<FilterResult> filters = status.filtered;
-			filters.addAll(AccountSessionManager.get(accountID).getClientSideFilters(status));
+
+			// Only add client filters if there are no pre-existing status filter
+			if(filters.isEmpty())
+				filters.addAll(AccountSessionManager.get(accountID).getClientSideFilters(status));
 
 			for(FilterResult filter:filters){
 				LegacyFilter f=filter.filter;