From 77057fcac5f784b6f238031e157bc42e84aed11a Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 21 Jul 2023 09:05:13 -0400
Subject: [PATCH] Apply hidden to boosted notes only.

---
 .../main/java/com/vitorpamplona/amethyst/model/Note.kt   | 9 ++++++++-
 .../com/vitorpamplona/amethyst/ui/note/NoteCompose.kt    | 3 +--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
index d1faff809..6a05a117f 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
@@ -571,8 +571,15 @@ open class Note(val idHex: String) {
     fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
         if (event == null) return false
 
+        val isBoostedNoteHidden = if (event is GenericRepostEvent || event is RepostEvent || event is CommunityPostApprovalEvent) {
+            replyTo?.lastOrNull()?.isHiddenFor(accountChoices) ?: false
+        } else {
+            false
+        }
+
         val isSensitive = event?.isSensitive() ?: false
-        return accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
+        return isBoostedNoteHidden ||
+            accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
             accountChoices.spammers.contains(author?.pubkeyHex) ||
             (isSensitive && accountChoices.showSensitiveContent == false)
     }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index 071806589..08e8bb6b8 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -291,9 +291,8 @@ fun CheckHiddenNoteCompose(
             nav = nav
         )
     } else {
-        val boostedNote = note.replyTo?.lastOrNull()
         val isHidden by accountViewModel.account.liveHiddenUsers.map {
-            note.isHiddenFor(it) || boostedNote?.isHiddenFor(it) == true
+            note.isHiddenFor(it)
         }.observeAsState(accountViewModel.isNoteHidden(note))
 
         Crossfade(targetState = isHidden) {