From fb7edd17978d8d3636681cc84512d047e6f7d35c Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 1 Mar 2023 16:15:49 -0500
Subject: [PATCH] Hides hidden users from main feeds.

---
 .../vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt | 1 +
 .../com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
index 182187e7c..9a9efdbbb 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
@@ -17,6 +17,7 @@ object HomeConversationsFeedFilter: FeedFilter<Note>() {
         (it.event is TextNoteEvent || it.event is RepostEvent)
           && it.author in user.follows
           // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+          && it.author?.let { !HomeNewThreadFeedFilter.account.isHidden(it) } ?: true
           && !it.isNewThread()
       }
       .sortedBy { it.event?.createdAt }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
index c2e786ad7..34ca1b737 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
@@ -17,6 +17,7 @@ object HomeNewThreadFeedFilter: FeedFilter<Note>() {
         (it.event is TextNoteEvent || it.event is RepostEvent)
           && it.author in user.follows
           // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+          && it.author?.let { !account.isHidden(it) } ?: true
           && it.isNewThread()
       }
       .sortedBy { it.event?.createdAt }