laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-10 08:27:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert: drop the kind 31989 search result collapsing

Browse Source 
Restores SearchBarViewModel to return search results unmodified.

https://claude.ai/code/session_015dX5vWqvXUYD8rzPYX8vTB
This commit is contained in:
Claude
2026-06-12 13:28:38 +00:00
parent ae993068aa
commit 7605a5659a
1 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/SearchBarViewModel.kt
+1 -31
View File
@@ -36,7 +36,6 @@ import com.vitorpamplona.amethyst.commons.search.SearchSource
import com.vitorpamplona.amethyst.commons.ui.feeds.InvalidatableContent
import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.LocalCache
import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.amethyst.model.User
import com.vitorpamplona.amethyst.service.relayClient.searchCommand.SearchQueryState
import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
@@ -44,7 +43,6 @@ import com.vitorpamplona.amethyst.ui.navigation.routes.Route
import com.vitorpamplona.amethyst.ui.navigation.routes.routeFor
import com.vitorpamplona.amethyst.ui.note.creators.userSuggestions.userUriPrefixes
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common.relaySetupInfoBuilder
import com.vitorpamplona.quartz.nip01Core.core.HexKey
import com.vitorpamplona.quartz.nip01Core.core.toHexKey
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.normalizeRelayUrlOrNull
@@ -59,7 +57,6 @@ import com.vitorpamplona.quartz.nip19Bech32.entities.NNote
import com.vitorpamplona.quartz.nip19Bech32.entities.NProfile
import com.vitorpamplona.quartz.nip19Bech32.entities.NPub
import com.vitorpamplona.quartz.nip19Bech32.entities.NSec
import com.vitorpamplona.quartz.nip89AppHandlers.recommendation.AppRecommendationEvent
import com.vitorpamplona.quartz.utils.Hex
import com.vitorpamplona.quartz.utils.Rfc3986
import com.vitorpamplona.quartz.utils.startsWithAny
@@ -263,7 +260,7 @@ class SearchBarViewModel(
) { term, _, currentScope, order, follows ->
if (currentScope == SearchScope.PEOPLE) return@combine emptyList()
val raw = collapseAppRecommendations(LocalCache.findNotesStartingWith(term, account.hiddenUsers))
val raw = LocalCache.findNotesStartingWith(term, account.hiddenUsers)
val filtered = if (follows != null) raw.filter { it.author?.pubkeyHex in follows } else raw
when (order) {
@@ -411,30 +408,3 @@ class SearchBarViewModel(
override fun <T : ViewModel> create(modelClass: Class<T>): T = SearchBarViewModel(account, nip05) as T
}
}
/**
* NIP-89 splits a user's app recommendations into one kind 31989 event per
* handled kind, so a matching author floods the results with near-identical
* entries. Keep only the most recent one per author.
*/
private fun collapseAppRecommendations(notes: List<Note>): List<Note> {
val newestPerAuthor = mutableMapOf<HexKey, Note>()
val others = ArrayList<Note>(notes.size)
notes.forEach { note ->
if (note.event is AppRecommendationEvent) {
val author = note.author?.pubkeyHex ?: note.idHex
val newest = newestPerAuthor[author]
if (newest == null || (note.createdAt() ?: 0) > (newest.createdAt() ?: 0)) {
newestPerAuthor[author] = note
}
} else {
others.add(note)
}
}
if (newestPerAuthor.isEmpty()) return notes
others.addAll(newestPerAuthor.values)
return others
}