apply Tusky side hometimeline filters to own posts again (#4879)

addresses part of #4874
tuskyapp · Jan 17, 2025 · 6c85f72 · 6c85f72
1 parent 9d1a4bc
commit 6c85f72
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt
@@ -181,16 +181,15 @@ abstract class TimelineViewModel(
 
     protected fun shouldFilterStatus(statusViewData: StatusViewData): Filter.Action {
         val status = statusViewData.asStatusOrNull()?.status ?: return Filter.Action.NONE
-        if (status.actionableStatus.account.id == activeAccountFlow.value?.accountId) {
-            // never filter own posts
-            return Filter.Action.NONE
-        }
         return if (
-            (status.inReplyToId != null && filterRemoveReplies) ||
+            (status.isReply && filterRemoveReplies) ||
             (status.reblog != null && filterRemoveReblogs) ||
-            ((status.account.id == status.reblog?.account?.id) && filterRemoveSelfReblogs)
+            (status.account.id == status.reblog?.account?.id && filterRemoveSelfReblogs)
         ) {
-            return Filter.Action.HIDE
+            Filter.Action.HIDE
+        } else if (status.actionableStatus.account.id == activeAccountFlow.value?.accountId) {
+            // Mastodon filters don't apply for own posts
+            Filter.Action.NONE
         } else {
             statusViewData.filterAction = filterModel.shouldFilterStatus(status.actionableStatus)
             statusViewData.filterAction