Merge pull request #2523 from davotoula/improve-search-toggles-pt2

Improve search part 2

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/SearchBarViewModel.kt

@@ -40,6 +40,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.searchCommand.SearchQueryState
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
 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.toHexKey
@@ -58,6 +59,7 @@ import com.vitorpamplona.quartz.nip19Bech32.entities.NSec
 import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.Rfc3986
 import com.vitorpamplona.quartz.utils.startsWithAny
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
@@ -171,19 +173,47 @@ class SearchBarViewModel(
             }.flowOn(Dispatchers.IO)
 
     @OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
-    val directEventResolver: Flow<Route?> =
+    val directRouteResolver: Flow<Route?> =
         searchTerm
-            .debounce(200)
             .mapLatest { term ->
                 if (term.isBlank()) return@mapLatest null
-                runCatching {
+                val parsed =
-                    when (val parsed = Nip19Parser.uriToRoute(term)?.entity) {
+                    runCatching { Nip19Parser.uriToRoute(term)?.entity }
-                        is NEvent -> Route.Note(parsed.hex)
+                        .onFailure { if (it is CancellationException) throw it }
-                        is NNote -> Route.Note(parsed.hex)
+                        .getOrNull()
-                        is NAddress -> Route.Note(parsed.aTag())
+                        ?: return@mapLatest null
-                        else -> null
+                when (parsed) {
+                    is NPub -> {
+                        LocalCache.consume(parsed)
+                        Route.Profile(parsed.hex)
                     }
-                }.getOrNull()
+
+                    is NProfile -> {
+                        LocalCache.consume(parsed)
+                        Route.Profile(parsed.hex)
+                    }
+
+                    is NNote -> {
+                        LocalCache.consume(parsed)
+                        Route.Note(parsed.hex)
+                    }
+
+                    is NEvent -> {
+                        LocalCache.consume(parsed)
+                        routeFor(LocalCache.getOrCreateNote(parsed.hex), account)
+                            ?: Route.EventRedirect(parsed.hex)
+                    }
+
+                    is NAddress -> {
+                        LocalCache.consume(parsed)
+                        routeFor(LocalCache.getOrCreateAddressableNote(parsed.address()), account)
+                            ?: Route.EventRedirect(parsed.aTag())
+                    }
+
+                    else -> {
+                        null
+                    }
+                }
             }.flowOn(Dispatchers.IO)
 
     val searchResultsUsers =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/SearchScreen.kt

@@ -186,7 +186,7 @@ private fun SearchBar(
 
         // bech32 auto-resolve: navigate on hit without displaying results
         launch {
-            searchBarViewModel.directEventResolver.filterNotNull().collect { route ->
+            searchBarViewModel.directRouteResolver.filterNotNull().collect { route ->
                 nav.nav(route)
                 searchBarViewModel.clear()
             }
@@ -215,6 +215,7 @@ private fun hasNonDefaultFilters(
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
+@Suppress("AssignedValueIsNeverRead")
 @Composable
 private fun SearchFilterRow(searchBarViewModel: SearchBarViewModel) {
     val currentScope by searchBarViewModel.scope.collectAsStateWithLifecycle()