From ece4e9074a784a4d93183834d6d037183c995b53 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sat, 12 Aug 2023 21:36:13 -0400 Subject: [PATCH] Updates the isHidden function to the same version the NoteCompose uses. --- .../amethyst/ui/note/ChatroomMessageCompose.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt index 7880a3450..63e3d1be3 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt @@ -125,15 +125,9 @@ fun CheckHiddenChatMessage( nav: (String) -> Unit, onWantsToReply: (Note) -> Unit ) { - val accountState by accountViewModel.accountLiveData.observeAsState() - - val isHidden by remember(accountState) { - derivedStateOf { - val isSensitive = baseNote.event?.isSensitive() ?: false - - accountState?.account?.isHidden(baseNote.author!!) == true || (isSensitive && accountState?.account?.showSensitiveContent == false) - } - } + val isHidden by accountViewModel.account.liveHiddenUsers.map { + baseNote.isHiddenFor(it) + }.observeAsState(accountViewModel.isNoteHidden(baseNote)) if (!isHidden) { LoadedChatMessageCompose(