Creates a feed filter option for only kind 3 users

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

@@ -350,6 +350,7 @@ class Account(
     val liveHomeFollowLists: StateFlow<IFeedTopNavFilter> =
         FeedTopNavFilterState(
             feedFilterListName = settings.defaultHomeFollowList,
+            kind3Follows = kind3FollowList.flow,
             allFollows = allFollows.flow,
             locationFlow = geolocationFlow,
             followsRelays = defaultGlobalRelays.flow,
@@ -365,6 +366,7 @@ class Account(
     val liveStoriesFollowLists: StateFlow<IFeedTopNavFilter> =
         FeedTopNavFilterState(
             feedFilterListName = settings.defaultStoriesFollowList,
+            kind3Follows = kind3FollowList.flow,
             allFollows = allFollows.flow,
             locationFlow = geolocationFlow,
             followsRelays = defaultGlobalRelays.flow,
@@ -380,6 +382,7 @@ class Account(
     val liveDiscoveryFollowLists: StateFlow<IFeedTopNavFilter> =
         FeedTopNavFilterState(
             feedFilterListName = settings.defaultDiscoveryFollowList,
+            kind3Follows = kind3FollowList.flow,
             allFollows = allFollows.flow,
             locationFlow = geolocationFlow,
             followsRelays = defaultGlobalRelays.flow,
@@ -395,6 +398,7 @@ class Account(
     val liveNotificationFollowLists: StateFlow<IFeedTopNavFilter> =
         FeedTopNavFilterState(
             feedFilterListName = settings.defaultNotificationFollowList,
+            kind3Follows = kind3FollowList.flow,
             allFollows = allFollows.flow,
             locationFlow = geolocationFlow,
             followsRelays = defaultGlobalRelays.flow,

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt

@@ -101,6 +101,9 @@ val ALL_FOLLOWS = " All Follows "
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 val ALL_USER_FOLLOWS = " All User Follows "
 
+// This has spaces to avoid mixing with a potential NIP-51 list with the same name.
+val KIND3_FOLLOWS = " Main User Follows "
+
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 val AROUND_ME = " Around Me "
 

amethyst/src/main/java/com/vitorpamplona/amethyst/model/topNavFeeds/FeedTopNavFilterState.kt

@@ -24,10 +24,13 @@ import com.vitorpamplona.amethyst.model.ALL_FOLLOWS
 import com.vitorpamplona.amethyst.model.ALL_USER_FOLLOWS
 import com.vitorpamplona.amethyst.model.AROUND_ME
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
+import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.nip02FollowLists.Kind3FollowListState
 import com.vitorpamplona.amethyst.model.serverList.MergedFollowListsState
 import com.vitorpamplona.amethyst.model.topNavFeeds.allFollows.AllFollowsFeedFlow
 import com.vitorpamplona.amethyst.model.topNavFeeds.allUserFollows.AllUserFollowsFeedFlow
+import com.vitorpamplona.amethyst.model.topNavFeeds.allUserFollows.Kind3UserFollowsFeedFlow
 import com.vitorpamplona.amethyst.model.topNavFeeds.aroundMe.AroundMeFeedFlow
 import com.vitorpamplona.amethyst.model.topNavFeeds.global.GlobalFeedFlow
 import com.vitorpamplona.amethyst.model.topNavFeeds.noteBased.NoteFeedFlow
@@ -42,6 +45,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
@@ -49,6 +53,7 @@ import kotlinx.coroutines.flow.transformLatest
 
 class FeedTopNavFilterState(
     val feedFilterListName: MutableStateFlow<String>,
+    val kind3Follows: StateFlow<Kind3FollowListState.Kind3Follows>,
     val allFollows: StateFlow<MergedFollowListsState.AllFollows>,
     val locationFlow: StateFlow<LocationState.LocationResult>,
     val followsRelays: StateFlow<Set<NormalizedRelayUrl>>,
@@ -63,6 +68,7 @@ class FeedTopNavFilterState(
             GLOBAL_FOLLOWS -> GlobalFeedFlow(followsRelays, proxyRelays)
             ALL_FOLLOWS -> AllFollowsFeedFlow(allFollows, followsRelays, blockedRelays, proxyRelays)
             ALL_USER_FOLLOWS -> AllUserFollowsFeedFlow(allFollows, followsRelays, blockedRelays, proxyRelays)
+            KIND3_FOLLOWS -> Kind3UserFollowsFeedFlow(kind3Follows, followsRelays, blockedRelays, proxyRelays)
             AROUND_ME -> AroundMeFeedFlow(locationFlow, followsRelays, proxyRelays)
             else -> {
                 val note = LocalCache.checkGetOrCreateAddressableNote(listName)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/topNavFeeds/allUserFollows/Kind3UserFollowsFeedFlow.kt

@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model.topNavFeeds.allUserFollows
+
+import com.vitorpamplona.amethyst.model.nip02FollowLists.Kind3FollowListState
+import com.vitorpamplona.amethyst.model.topNavFeeds.IFeedFlowsType
+import com.vitorpamplona.amethyst.model.topNavFeeds.IFeedTopNavFilter
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+
+class Kind3UserFollowsFeedFlow(
+    val allFollows: StateFlow<Kind3FollowListState.Kind3Follows>,
+    val followsRelays: StateFlow<Set<NormalizedRelayUrl>>,
+    val blockedRelays: StateFlow<Set<NormalizedRelayUrl>>,
+    val proxyRelays: StateFlow<Set<NormalizedRelayUrl>>,
+) : IFeedFlowsType {
+    fun convert(
+        allFollows: Kind3FollowListState.Kind3Follows?,
+        proxyRelays: Set<NormalizedRelayUrl>,
+    ): IFeedTopNavFilter =
+        if (allFollows != null) {
+            if (proxyRelays.isEmpty()) {
+                AllUserFollowsByOutboxTopNavFilter(
+                    authors = allFollows.authors,
+                    defaultRelays = followsRelays,
+                    blockedRelays = blockedRelays,
+                )
+            } else {
+                AllUserFollowsByProxyTopNavFilter(
+                    authors = allFollows.authors,
+                    proxyRelays = proxyRelays,
+                )
+            }
+        } else {
+            AllUserFollowsByOutboxTopNavFilter(
+                authors = emptySet(),
+                defaultRelays = followsRelays,
+                blockedRelays = blockedRelays,
+            )
+        }
+
+    override fun flow() = combine(allFollows, proxyRelays, ::convert)
+
+    override fun startValue(): IFeedTopNavFilter = convert(allFollows.value, proxyRelays.value)
+
+    override suspend fun startValue(collector: FlowCollector<IFeedTopNavFilter>) {
+        collector.emit(startValue())
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt

@@ -933,7 +933,7 @@ fun ObserveLikeText(
     inner: @Composable (Int) -> Unit,
 ) {
     val reactionCount by observeNoteReactionCount(baseNote, accountViewModel)
-    println("AABBCC $reactionCount ${baseNote.idHex}")
+
     inner(reactionCount)
 }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/TopNavFilterState.kt

@@ -30,6 +30,7 @@ import com.vitorpamplona.amethyst.model.AROUND_ME
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
+import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -72,7 +73,7 @@ class TopNavFilterState(
     val account: Account,
     val scope: CoroutineScope,
 ) {
-    val kind3Follow =
+    val allFollows =
         PeopleListOutBoxFeedDefinition(
             code = ALL_FOLLOWS,
             name = ResourceName(R.string.follow_list_kind3follows),
@@ -81,7 +82,7 @@ class TopNavFilterState(
             unpackList = listOf(ContactListEvent.blockListFor(account.signer.pubKey)),
         )
 
-    val kind3FollowUsers =
+    val userFollows =
         PeopleListOutBoxFeedDefinition(
             code = ALL_USER_FOLLOWS,
             name = ResourceName(R.string.follow_list_kind3follows_users_only),
@@ -90,6 +91,15 @@ class TopNavFilterState(
             unpackList = listOf(ContactListEvent.blockListFor(account.signer.pubKey)),
         )
 
+    val kind3Follows =
+        PeopleListOutBoxFeedDefinition(
+            code = KIND3_FOLLOWS,
+            name = ResourceName(R.string.follow_list_kind3_follows_users_only),
+            type = CodeNameType.HARDCODED,
+            kinds = DEFAULT_FEED_KINDS,
+            unpackList = listOf(ContactListEvent.blockListFor(account.signer.pubKey)),
+        )
+
     val globalFollow =
         GlobalFeedDefinition(
             code = GLOBAL_FOLLOWS,
@@ -115,7 +125,7 @@ class TopNavFilterState(
             unpackList = listOf(MuteListEvent.blockListFor(account.userProfile().pubkeyHex)),
         )
 
-    val defaultLists = persistentListOf(kind3Follow, kind3FollowUsers, aroundMe, globalFollow, muteListFollow)
+    val defaultLists = persistentListOf(allFollows, userFollows, kind3Follows, aroundMe, globalFollow, muteListFollow)
 
     fun mergePeopleLists(
         peopleLists: List<AddressableNote>,
@@ -229,7 +239,7 @@ class TopNavFilterState(
             checkNotInMainThread()
             emit(
                 listOf(
-                    listOf(kind3Follow, kind3FollowUsers, aroundMe, globalFollow),
+                    listOf(allFollows, userFollows, kind3Follows, aroundMe, globalFollow),
                     myLivePeopleListsFlow,
                     myLiveKind3FollowsFlow,
                     listOf(muteListFollow),
@@ -245,7 +255,7 @@ class TopNavFilterState(
             checkNotInMainThread()
             emit(
                 listOf(
-                    listOf(kind3Follow, kind3FollowUsers, aroundMe, globalFollow),
+                    listOf(allFollows, userFollows, kind3Follows, aroundMe, globalFollow),
                     myLivePeopleListsFlow,
                     listOf(muteListFollow),
                 ).flatten().toImmutableList(),

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoveryTopBar.kt

@@ -63,7 +63,7 @@ private fun TopNavFilterBar(
         placeholderCode = listName,
         explainer = stringRes(R.string.select_list_to_filter),
         options = allLists,
-        onSelect = { onChange(allLists.getOrNull(it) ?: followListsModel.kind3Follow) },
+        onSelect = { onChange(allLists.getOrNull(it) ?: followListsModel.allFollows) },
         accountViewModel = accountViewModel,
     )
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/HomeTopBar.kt

@@ -68,7 +68,7 @@ private fun TopNavFilterBar(
         placeholderCode = listName,
         explainer = stringRes(R.string.select_list_to_filter),
         options = allLists,
-        onSelect = { onChange(allLists.getOrNull(it) ?: followListsModel.kind3Follow) },
+        onSelect = { onChange(allLists.getOrNull(it) ?: followListsModel.allFollows) },
         accountViewModel = accountViewModel,
     )
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationTopBar.kt

@@ -63,7 +63,7 @@ private fun TopNavFilterBar(
         placeholderCode = listName,
         explainer = stringRes(R.string.select_list_to_filter),
         options = allLists,
-        onSelect = { onChange(allLists.getOrNull(it) ?: followListsModel.kind3Follow) },
+        onSelect = { onChange(allLists.getOrNull(it) ?: followListsModel.allFollows) },
         accountViewModel = accountViewModel,
     )
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/StoriesTopBar.kt

@@ -64,7 +64,7 @@ private fun TopNavFilterBar(
         placeholderCode = listName,
         explainer = stringRes(R.string.select_list_to_filter),
         options = allLists,
-        onSelect = { onChange(allLists.getOrNull(it) ?: followListsModel.kind3Follow) },
+        onSelect = { onChange(allLists.getOrNull(it) ?: followListsModel.allFollows) },
         accountViewModel = accountViewModel,
     )
 }

amethyst/src/main/res/values/strings.xml

@@ -506,6 +506,7 @@
     <string name="follow_list_selection">Follow List</string>
     <string name="follow_list_kind3follows">All Follows</string>
     <string name="follow_list_kind3follows_users_only">All User Follows</string>
+    <string name="follow_list_kind3_follows_users_only">Default Follow List</string>
     <string name="follow_list_kind3follows_proxy">Follows via Proxy</string>
     <string name="follow_list_aroundme">Around Me</string>
     <string name="follow_list_global">Global</string>