From 6c85f72a35447ab39e6415ebfc1e65195051d0f9 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 17 Jan 2025 13:18:49 +0100 Subject: [PATCH] apply Tusky side hometimeline filters to own posts again (#4879) addresses part of #4874 --- .../timeline/viewmodel/TimelineViewModel.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 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 index 4f2ab340bc..df3dbcc94a 100644 --- 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