Migrates to MuteList 10000

app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -41,6 +41,7 @@ import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.FileHeaderEvent
 import com.vitorpamplona.quartz.events.FileStorageEvent
 import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.events.GeneralListEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.GiftWrapEvent
 import com.vitorpamplona.quartz.events.HTTPAuthorizationEvent
@@ -51,6 +52,7 @@ import com.vitorpamplona.quartz.events.LnZapPaymentRequestEvent
 import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.NIP24Factory
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
@@ -71,6 +73,7 @@ import com.vitorpamplona.quartz.signers.NostrSignerInternal
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableSet
+import kotlinx.collections.immutable.toPersistentSet
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -299,7 +302,7 @@ class Account(
     }
 
     private fun decryptLiveFollows(peopleListFollows: NoteState?, onReady: (LiveFollowLists) -> Unit) {
-        val listEvent = (peopleListFollows?.note?.event as? PeopleListEvent)
+        val listEvent = (peopleListFollows?.note?.event as? GeneralListEvent)
         listEvent?.privateTags(signer) { privateTagList ->
             onReady(
                 LiveFollowLists(
@@ -321,27 +324,37 @@ class Account(
     )
 
     val flowHiddenUsers: StateFlow<LiveHiddenUsers> by lazy {
-        combineTransform(live.asFlow(), getBlockListNote().flow().metadata.stateFlow) { localLive, blockList ->
+        combineTransform(
+            live.asFlow(),
+            getBlockListNote().flow().metadata.stateFlow,
+            getMuteListNote().flow().metadata.stateFlow
+        ) { localLive, blockList, muteList ->
             checkNotInMainThread()
 
-            val result = withTimeoutOrNull(1000) {
+            val resultBlockList = withTimeoutOrNull(1000) {
                 suspendCancellableCoroutine { continuation ->
                     (blockList.note.event as? PeopleListEvent)?.publicAndPrivateUsersAndWords(signer) {
                         continuation.resume(it)
                     }
                 }
-            }
+            } ?: PeopleListEvent.UsersAndWords()
 
-            result?.let {
-                emit(
-                    LiveHiddenUsers(
-                        hiddenUsers = it.users,
-                        hiddenWords = it.words,
-                        spammers = localLive.account.transientHiddenUsers,
-                        showSensitiveContent = localLive.account.showSensitiveContent
-                    )
+            val resultMuteList = withTimeoutOrNull(1000) {
+                suspendCancellableCoroutine { continuation ->
+                    (muteList.note.event as? MuteListEvent)?.publicAndPrivateUsersAndWords(signer) {
+                        continuation.resume(it)
+                    }
+                }
+            } ?: PeopleListEvent.UsersAndWords()
+
+            emit(
+                LiveHiddenUsers(
+                    hiddenUsers = (resultBlockList.users + resultMuteList.users).toPersistentSet(),
+                    hiddenWords = (resultBlockList.words + resultMuteList.words).toPersistentSet(),
+                    spammers = localLive.account.transientHiddenUsers,
+                    showSensitiveContent = localLive.account.showSensitiveContent
                 )
-            }
+            )
         }.stateIn(
             scope,
             SharingStarted.Eagerly,
@@ -1425,38 +1438,45 @@ class Account(
         return LocalCache.getOrCreateAddressableNote(aTag)
     }
 
+    fun getMuteListNote(): AddressableNote {
+        val aTag = ATag(
+            MuteListEvent.kind,
+            userProfile().pubkeyHex,
+            "",
+            null
+        )
+        return LocalCache.getOrCreateAddressableNote(aTag)
+    }
+
     fun getBlockList(): PeopleListEvent? {
         return getBlockListNote().event as? PeopleListEvent
     }
 
-    fun hideWord(word: String) {
-        val blockList = getBlockList()
+    fun getMuteList(): MuteListEvent? {
+        return getMuteListNote().event as? MuteListEvent
+    }
 
-        if (blockList != null) {
-            PeopleListEvent.addWord(
-                earlierVersion = blockList,
+    fun hideWord(word: String) {
+        val muteList = getMuteList()
+
+        if (muteList != null) {
+            MuteListEvent.addWord(
+                earlierVersion = muteList,
                 word = word,
                 isPrivate = true,
                 signer = signer
             ) {
                 Client.send(it)
                 LocalCache.consume(it)
-
-                live.invalidateData()
-                saveable.invalidateData()
             }
         } else {
-            PeopleListEvent.createListWithWord(
-                name = PeopleListEvent.blockList,
+            MuteListEvent.createListWithWord(
                 word = word,
                 isPrivate = true,
                 signer = signer
             ) {
                 Client.send(it)
                 LocalCache.consume(it)
-
-                live.invalidateData()
-                saveable.invalidateData()
             }
         }
     }
@@ -1473,46 +1493,50 @@ class Account(
             ) {
                 Client.send(it)
                 LocalCache.consume(it)
+            }
+        }
 
-                live.invalidateData()
-                saveable.invalidateData()
+        val muteList = getMuteList()
+
+        if (muteList != null) {
+            MuteListEvent.removeWord(
+                earlierVersion = muteList,
+                word = word,
+                isPrivate = true,
+                signer = signer
+            ) {
+                Client.send(it)
+                LocalCache.consume(it)
             }
         }
     }
 
-    suspend fun hideUser(pubkeyHex: String) {
-        val blockList = getBlockList()
+    fun hideUser(pubkeyHex: String) {
+        val muteList = getMuteList()
 
-        if (blockList != null) {
-            PeopleListEvent.addUser(
-                earlierVersion = blockList,
+        if (muteList != null) {
+            MuteListEvent.addUser(
+                earlierVersion = muteList,
                 pubKeyHex = pubkeyHex,
                 isPrivate = true,
                 signer = signer
             ) {
                 Client.send(it)
                 LocalCache.consume(it)
-
-                live.invalidateData()
-                saveable.invalidateData()
             }
         } else {
-            PeopleListEvent.createListWithUser(
-                name = PeopleListEvent.blockList,
+            MuteListEvent.createListWithUser(
                 pubKeyHex = pubkeyHex,
                 isPrivate = true,
                 signer = signer
             ) {
                 Client.send(it)
                 LocalCache.consume(it)
-
-                live.invalidateData()
-                saveable.invalidateData()
             }
         }
     }
 
-    suspend fun showUser(pubkeyHex: String) {
+    fun showUser(pubkeyHex: String) {
         val blockList = getBlockList()
 
         if (blockList != null) {
@@ -1524,12 +1548,26 @@ class Account(
             ) {
                 Client.send(it)
                 LocalCache.consume(it)
-
-                transientHiddenUsers = (transientHiddenUsers - pubkeyHex).toImmutableSet()
-                live.invalidateData()
-                saveable.invalidateData()
             }
         }
+
+        val muteList = getMuteList()
+
+        if (muteList != null) {
+            MuteListEvent.removeUser(
+                earlierVersion = muteList,
+                pubKeyHex = pubkeyHex,
+                isPrivate = true,
+                signer = signer
+            ) {
+                Client.send(it)
+                LocalCache.consume(it)
+            }
+        }
+
+        transientHiddenUsers = (transientHiddenUsers - pubkeyHex).toImmutableSet()
+        live.invalidateData()
+        saveable.invalidateData()
     }
 
     fun changeDefaultZapType(zapType: LnZapEvent.ZapType) {

app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -57,6 +57,7 @@ import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.NNSEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PinListEvent
@@ -425,6 +426,7 @@ object LocalCache {
         }
     }
 
+    fun consume(event: MuteListEvent) { consumeBaseReplaceable(event) }
     fun consume(event: PeopleListEvent) { consumeBaseReplaceable(event) }
     private fun consume(event: AdvertisedRelayListEvent) { consumeBaseReplaceable(event) }
     private fun consume(event: CommunityDefinitionEvent, relay: Relay?) { consumeBaseReplaceable(event) }
@@ -696,7 +698,7 @@ object LocalCache {
 
         val author = getOrCreateUser(event.pubKey)
         val repliesTo = event.originalPost().mapNotNull { checkGetOrCreateNote(it) } +
-            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) }
 
         note.loadEvent(event, author, repliesTo)
 
@@ -1561,6 +1563,7 @@ object LocalCache {
                 is LnZapPaymentResponseEvent -> consume(event)
                 is LongTextNoteEvent -> consume(event, relay)
                 is MetadataEvent -> consume(event)
+                is MuteListEvent -> consume(event)
                 is NNSEvent -> comsume(event)
                 is PrivateDmEvent -> consume(event, relay)
                 is PinListEvent -> consume(event)

app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt

@@ -23,6 +23,7 @@ import com.vitorpamplona.quartz.events.GiftWrapEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
@@ -87,7 +88,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind),
+                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind, MuteListEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
                 limit = 100
             )

app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -167,9 +167,10 @@ class MainActivity : AppCompatActivity() {
     override fun onStop() {
         super.onStop()
 
-        GlobalScope.launch(Dispatchers.Default) {
-            serviceManager.trimMemory()
-        }
+        // Graph doesn't completely clear.
+        // GlobalScope.launch(Dispatchers.Default) {
+        //    serviceManager.trimMemory()
+        // }
 
         Log.d("Lifetime Event", "MainActivity.onStop")
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverChatFeedFilter.kt

@@ -7,6 +7,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.ParticipantListBuilder
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.IsInPublicChatChannel
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 
@@ -16,7 +17,8 @@ open class DiscoverChatFeedFilter(val account: Account) : AdditiveFeedFilter<Not
     }
 
     override fun showHiddenKey(): Boolean {
-        return account.defaultDiscoveryFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex)
+        return account.defaultDiscoveryFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex) ||
+            account.defaultDiscoveryFollowList.value == MuteListEvent.blockListFor(account.userProfile().pubkeyHex)
     }
 
     override fun feed(): List<Note> {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverCommunityFeedFilter.kt

@@ -7,6 +7,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.ParticipantListBuilder
 import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
 import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 
@@ -16,7 +17,8 @@ open class DiscoverCommunityFeedFilter(val account: Account) : AdditiveFeedFilte
     }
 
     override fun showHiddenKey(): Boolean {
-        return account.defaultDiscoveryFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex)
+        return account.defaultDiscoveryFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex) ||
+            account.defaultDiscoveryFollowList.value == MuteListEvent.blockListFor(account.userProfile().pubkeyHex)
     }
 
     override fun feed(): List<Note> {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt

@@ -9,6 +9,7 @@ import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_ENDED
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_LIVE
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_PLANNED
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 
@@ -24,7 +25,8 @@ open class DiscoverLiveFeedFilter(
     }
 
     override fun showHiddenKey(): Boolean {
-        return followList() == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex)
+        return followList() == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex) ||
+            followList() == MuteListEvent.blockListFor(account.userProfile().pubkeyHex)
     }
 
     override fun feed(): List<Note> {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt

@@ -14,9 +14,9 @@ class HiddenAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
     }
 
     override fun feed(): List<User> {
-        return account.liveHiddenUsers.value?.hiddenUsers?.map {
+        return account.flowHiddenUsers.value.hiddenUsers.map {
             LocalCache.getOrCreateUser(it)
-        } ?: emptyList()
+        }
     }
 }
 
@@ -30,7 +30,7 @@ class HiddenWordsFeedFilter(val account: Account) : FeedFilter<String>() {
     }
 
     override fun feed(): List<String> {
-        return account.liveHiddenUsers.value?.hiddenWords?.toList() ?: emptyList()
+        return account.flowHiddenUsers.value.hiddenWords.toList()
     }
 }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt

@@ -6,6 +6,7 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
@@ -18,7 +19,8 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Not
     }
 
     override fun showHiddenKey(): Boolean {
-        return account.defaultHomeFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex)
+        return account.defaultHomeFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex) ||
+            account.defaultHomeFollowList.value == MuteListEvent.blockListFor(account.userProfile().pubkeyHex)
     }
 
     override fun feed(): List<Note> {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt

@@ -10,6 +10,7 @@ import com.vitorpamplona.quartz.events.ClassifiedsEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.RepostEvent
@@ -23,7 +24,8 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
     }
 
     override fun showHiddenKey(): Boolean {
-        return account.defaultHomeFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex)
+        return account.defaultHomeFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex) ||
+            account.defaultHomeFollowList.value == MuteListEvent.blockListFor(account.userProfile().pubkeyHex)
     }
 
     override fun feed(): List<Note> {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt

@@ -14,6 +14,7 @@ import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.GiftWrapEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.RepostEvent
@@ -24,7 +25,8 @@ class NotificationFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
     }
 
     override fun showHiddenKey(): Boolean {
-        return account.defaultNotificationFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex)
+        return account.defaultNotificationFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex) ||
+            account.defaultNotificationFollowList.value == MuteListEvent.blockListFor(account.userProfile().pubkeyHex)
     }
 
     override fun feed(): List<Note> {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/VideoFeedFilter.kt

@@ -6,6 +6,7 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.quartz.events.FileHeaderEvent
 import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 
@@ -15,7 +16,8 @@ class VideoFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
     }
 
     override fun showHiddenKey(): Boolean {
-        return account.defaultStoriesFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex)
+        return account.defaultStoriesFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex) ||
+            account.defaultStoriesFollowList.value == MuteListEvent.blockListFor(account.userProfile().pubkeyHex)
     }
 
     override fun feed(): List<Note> {
@@ -31,7 +33,8 @@ class VideoFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
         val now = TimeUtils.now()
         val isGlobal = account.defaultStoriesFollowList.value == GLOBAL_FOLLOWS
-        val isHiddenList = account.defaultStoriesFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex)
+        val isHiddenList = account.defaultStoriesFollowList.value == PeopleListEvent.blockListFor(account.userProfile().pubkeyHex) ||
+            account.defaultStoriesFollowList.value == MuteListEvent.blockListFor(account.userProfile().pubkeyHex)
 
         val followingKeySet = account.liveStoriesFollowLists.value?.users ?: emptySet()
         val followingTagSet = account.liveStoriesFollowLists.value?.hashtags ?: emptySet()

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

@@ -118,6 +118,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size40dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -589,6 +590,11 @@ data class CodeName(val code: String, val name: Name, val type: CodeNameType)
 class FollowListViewModel(val account: Account) : ViewModel() {
     val kind3Follow = CodeName(KIND3_FOLLOWS, ResourceName(R.string.follow_list_kind3follows), CodeNameType.HARDCODED)
     val globalFollow = CodeName(GLOBAL_FOLLOWS, ResourceName(R.string.follow_list_global), CodeNameType.HARDCODED)
+    val muteListFollow = CodeName(
+        MuteListEvent.blockListFor(account.userProfile().pubkeyHex),
+        ResourceName(R.string.follow_list_mute_list),
+        CodeNameType.HARDCODED
+    )
 
     private var _kind3GlobalPeopleRoutes = MutableStateFlow<ImmutableList<CodeName>>(emptyList<CodeName>().toPersistentList())
     val kind3GlobalPeopleRoutes = _kind3GlobalPeopleRoutes.asStateFlow()
@@ -634,13 +640,13 @@ class FollowListViewModel(val account: Account) : ViewModel() {
 
         val routeList = (communities + hashtags + geotags).sortedBy { it.name.name() }
 
-        val kind3GlobalPeopleRouteList = listOf(listOf(kind3Follow, globalFollow), newFollowLists, routeList).flatten().toImmutableList()
+        val kind3GlobalPeopleRouteList = listOf(listOf(kind3Follow, globalFollow), newFollowLists, routeList, listOf(muteListFollow)).flatten().toImmutableList()
 
         if (!equalImmutableLists(_kind3GlobalPeopleRoutes.value, kind3GlobalPeopleRouteList)) {
             _kind3GlobalPeopleRoutes.emit(kind3GlobalPeopleRouteList)
         }
 
-        val kind3GlobalPeopleList = listOf(listOf(kind3Follow, globalFollow), newFollowLists).flatten().toImmutableList()
+        val kind3GlobalPeopleList = listOf(listOf(kind3Follow, globalFollow), newFollowLists, listOf(muteListFollow)).flatten().toImmutableList()
 
         if (!equalImmutableLists(_kind3GlobalPeople.value, kind3GlobalPeopleList)) {
             _kind3GlobalPeople.emit(kind3GlobalPeopleList)
@@ -656,7 +662,7 @@ class FollowListViewModel(val account: Account) : ViewModel() {
             LocalCache.live.newEventBundles.collect { newNotes ->
                 checkNotInMainThread()
                 if (newNotes.any {
-                    it.event?.pubKey() == account.userProfile().pubkeyHex && (it.event is PeopleListEvent || it.event is ContactListEvent)
+                    it.event?.pubKey() == account.userProfile().pubkeyHex && (it.event is PeopleListEvent || it.event is MuteListEvent || it.event is ContactListEvent)
                 }
                 ) {
                     refresh()

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt

@@ -153,8 +153,7 @@ class AccountViewModel(val account: Account, val settings: SettingsState) : View
     }
 
     fun isNoteHidden(note: Note): Boolean {
-        val isSensitive = note.event?.isSensitive() ?: false
-        return account.isHidden(note.author!!) || (isSensitive && account.showSensitiveContent == false)
+        return note.isHiddenFor(account.flowHiddenUsers.value)
     }
 
     fun hasReactedTo(baseNote: Note, reaction: String): Boolean {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt

@@ -42,6 +42,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.map
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -214,7 +215,9 @@ private fun AddMuteWordTextField(accountViewModel: AccountViewModel) {
             value = currentWordToAdd.value,
             onValueChange = { currentWordToAdd.value = it },
             label = { Text(text = stringResource(R.string.hide_new_word_label)) },
-            modifier = Modifier.fillMaxWidth().padding(10.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(10.dp),
             placeholder = {
                 Text(
                     text = stringResource(R.string.hide_new_word_label),
@@ -260,7 +263,7 @@ fun WatchAccountAndBlockList(
     accountViewModel: AccountViewModel
 ) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
-    val blockListState by accountViewModel.account.getBlockListNote().live().metadata.observeAsState()
+    val blockListState by accountViewModel.account.flowHiddenUsers.collectAsStateWithLifecycle()
 
     LaunchedEffect(accountViewModel, accountState, blockListState) {
         feedViewModel.invalidateData()

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt

@@ -142,7 +142,7 @@ fun WatchAccountForNotifications(
     notifFeedViewModel: NotificationViewModel,
     accountViewModel: AccountViewModel
 ) {
-    val listState by accountViewModel.account.liveStoriesFollowLists.collectAsStateWithLifecycle()
+    val listState by accountViewModel.account.liveNotificationFollowLists.collectAsStateWithLifecycle()
 
     LaunchedEffect(accountViewModel, listState) {
         NostrAccountDataSource.account = accountViewModel.account