nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

style: spotlessApply formatting + fix icon imports for upstream MaterialSymbols

Browse Source
This commit is contained in:
m
2026-05-08 22:37:24 +10:00
parent 23a7ac4770
commit 9d84d01569
10 changed files with 393 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/nip05DnsIdentifiers/namecoin/NamecoinSettingsTest.kt
+8 -4
View File
@@ -116,8 +116,10 @@ class NamecoinSettingsTest {
@Test @Test
fun `returns parsed list for valid custom servers`() { fun `returns parsed list for valid custom servers`() {
val settings = NamecoinSettings( val settings =
customServers = listOf( NamecoinSettings(
customServers =
listOf(
"server1.com:50006", "server1.com:50006",
"server2.onion:50001:tcp", "server2.onion:50001:tcp",
), ),
@@ -134,8 +136,10 @@ class NamecoinSettingsTest {
@Test @Test
fun `skips invalid entries in custom server list`() { fun `skips invalid entries in custom server list`() {
val settings = NamecoinSettings( val settings =
customServers = listOf( NamecoinSettings(
customServers =
listOf(
"valid.com:50006", "valid.com:50006",
"invalid", // no port "invalid", // no port
"also-invalid:abc", // non-numeric port "also-invalid:abc", // non-numeric port
desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt
+4 -7
View File
@@ -89,6 +89,10 @@ import com.vitorpamplona.amethyst.desktop.platform.applyNativeWindowChrome
import com.vitorpamplona.amethyst.desktop.service.highlights.DesktopHighlightStore import com.vitorpamplona.amethyst.desktop.service.highlights.DesktopHighlightStore
import com.vitorpamplona.amethyst.desktop.service.images.DesktopImageLoaderSetup import com.vitorpamplona.amethyst.desktop.service.images.DesktopImageLoaderSetup
import com.vitorpamplona.amethyst.desktop.service.media.VlcjPlayerPool import com.vitorpamplona.amethyst.desktop.service.media.VlcjPlayerPool
import com.vitorpamplona.amethyst.desktop.service.namecoin.DesktopNamecoinNameService
import com.vitorpamplona.amethyst.desktop.service.namecoin.DesktopNamecoinPreferences
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinPreferences
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinService
import com.vitorpamplona.amethyst.desktop.subscriptions.DesktopRelaySubscriptionsCoordinator import com.vitorpamplona.amethyst.desktop.subscriptions.DesktopRelaySubscriptionsCoordinator
import com.vitorpamplona.amethyst.desktop.ui.ComposeNoteDialog import com.vitorpamplona.amethyst.desktop.ui.ComposeNoteDialog
import com.vitorpamplona.amethyst.desktop.ui.ConnectingRelaysScreen import com.vitorpamplona.amethyst.desktop.ui.ConnectingRelaysScreen
@@ -110,16 +114,10 @@ import com.vitorpamplona.amethyst.desktop.ui.deck.param
import com.vitorpamplona.amethyst.desktop.ui.media.LocalAwtWindow import com.vitorpamplona.amethyst.desktop.ui.media.LocalAwtWindow
import com.vitorpamplona.amethyst.desktop.ui.media.LocalIsImmersiveFullscreen import com.vitorpamplona.amethyst.desktop.ui.media.LocalIsImmersiveFullscreen
import com.vitorpamplona.amethyst.desktop.ui.media.LocalWindowState import com.vitorpamplona.amethyst.desktop.ui.media.LocalWindowState
import com.vitorpamplona.amethyst.desktop.service.namecoin.DesktopNamecoinNameService
import com.vitorpamplona.amethyst.desktop.service.namecoin.DesktopNamecoinPreferences
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinPreferences
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinService
import com.vitorpamplona.amethyst.desktop.ui.ImportFollowListDialog
import com.vitorpamplona.amethyst.desktop.ui.profile.ProfileInfoCard import com.vitorpamplona.amethyst.desktop.ui.profile.ProfileInfoCard
import com.vitorpamplona.amethyst.desktop.ui.relay.LocalRelayCategories import com.vitorpamplona.amethyst.desktop.ui.relay.LocalRelayCategories
import com.vitorpamplona.amethyst.desktop.ui.relay.RelayStatusCard import com.vitorpamplona.amethyst.desktop.ui.relay.RelayStatusCard
import com.vitorpamplona.amethyst.desktop.ui.settings.MediaServerSettings import com.vitorpamplona.amethyst.desktop.ui.settings.MediaServerSettings
import com.vitorpamplona.amethyst.desktop.ui.settings.NamecoinSettingsSection
import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
@@ -1670,7 +1668,6 @@ fun RelaySettingsScreen(
LazyColumn( LazyColumn(
verticalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
modifier = Modifier.weight(1f),
) { ) {
items(relayStatuses.values.toList(), key = { it.url.url }) { status -> items(relayStatuses.values.toList(), key = { it.url.url }) { status ->
RelayStatusCard( RelayStatusCard(
desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/service/namecoin/DesktopNamecoinNameService.kt
+7 -6
View File
@@ -24,7 +24,6 @@ import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.Nam
import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.NamecoinSettings import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.NamecoinSettings
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.DEFAULT_ELECTRUMX_SERVERS import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.DEFAULT_ELECTRUMX_SERVERS
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.ElectrumXClient import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.ElectrumXClient
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.ElectrumxServer
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinLookupCache import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinLookupCache
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinNameResolver import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinNameResolver
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinNostrResult import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinNostrResult
@@ -49,11 +48,13 @@ class DesktopNamecoinNameService(
) { ) {
private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
private val electrumxClient = ElectrumXClient( private val electrumxClient =
ElectrumXClient(
socketFactory = { SocketFactory.getDefault() }, socketFactory = { SocketFactory.getDefault() },
) )
private val resolver = NamecoinNameResolver( private val resolver =
NamecoinNameResolver(
electrumxClient = electrumxClient, electrumxClient = electrumxClient,
serverListProvider = { serverListProvider = {
val settings = preferencesProvider() val settings = preferencesProvider()
@@ -92,8 +93,7 @@ class DesktopNamecoinNameService(
/** /**
* Resolve with detailed outcome for error reporting. * Resolve with detailed outcome for error reporting.
*/ */
suspend fun resolveDetailed(identifier: String): NamecoinResolveOutcome = suspend fun resolveDetailed(identifier: String): NamecoinResolveOutcome = resolver.resolveDetailed(identifier)
resolver.resolveDetailed(identifier)
/** /**
* Verify that a Namecoin name maps to the expected pubkey. * Verify that a Namecoin name maps to the expected pubkey.
@@ -120,7 +120,8 @@ class DesktopNamecoinNameService(
scope.launch { scope.launch {
try { try {
val result = resolve(identifier) val result = resolve(identifier)
state.value = if (result != null) { state.value =
if (result != null) {
NamecoinResolveState.Resolved(result) NamecoinResolveState.Resolved(result)
} else { } else {
NamecoinResolveState.NotFound NamecoinResolveState.NotFound
desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/service/namecoin/DesktopNamecoinPreferences.kt
+8 -7
View File
@@ -20,10 +20,10 @@
*/ */
package com.vitorpamplona.amethyst.desktop.service.namecoin package com.vitorpamplona.amethyst.desktop.service.namecoin
import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.NamecoinSettings
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.ElectrumxServer
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.readValue
import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.NamecoinSettings
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.ElectrumxServer
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import java.util.prefs.Preferences import java.util.prefs.Preferences
@@ -39,7 +39,8 @@ import java.util.prefs.Preferences
* `serverListProvider` lambda). * `serverListProvider` lambda).
*/ */
class DesktopNamecoinPreferences( class DesktopNamecoinPreferences(
private val prefs: Preferences = Preferences.userNodeForPackage( private val prefs: Preferences =
Preferences.userNodeForPackage(
DesktopNamecoinPreferences::class.java, DesktopNamecoinPreferences::class.java,
), ),
) { ) {
@@ -101,11 +102,12 @@ class DesktopNamecoinPreferences(
} }
} }
private fun loadFromDisk(): NamecoinSettings { private fun loadFromDisk(): NamecoinSettings =
return try { try {
val enabled = prefs.getBoolean(KEY_ENABLED, true) val enabled = prefs.getBoolean(KEY_ENABLED, true)
val serversJson = prefs.get(KEY_CUSTOM_SERVERS, null) val serversJson = prefs.get(KEY_CUSTOM_SERVERS, null)
val servers = if (serversJson != null) { val servers =
if (serversJson != null) {
try { try {
mapper.readValue<List<String>>(serversJson) mapper.readValue<List<String>>(serversJson)
} catch (_: Exception) { } catch (_: Exception) {
@@ -120,4 +122,3 @@ class DesktopNamecoinPreferences(
NamecoinSettings.DEFAULT NamecoinSettings.DEFAULT
} }
} }
}
desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/ImportFollowListDialog.kt
+51 -24
View File
@@ -31,13 +31,9 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.Person
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.Checkbox import androidx.compose.material3.Checkbox
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedButton
@@ -65,6 +61,8 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
import com.vitorpamplona.amethyst.desktop.account.AccountState import com.vitorpamplona.amethyst.desktop.account.AccountState
import com.vitorpamplona.amethyst.desktop.cache.DesktopLocalCache import com.vitorpamplona.amethyst.desktop.cache.DesktopLocalCache
import com.vitorpamplona.amethyst.desktop.network.DesktopRelayConnectionManager import com.vitorpamplona.amethyst.desktop.network.DesktopRelayConnectionManager
@@ -92,12 +90,25 @@ import java.util.concurrent.TimeUnit
*/ */
private sealed class ImportState { private sealed class ImportState {
data object Idle : ImportState() data object Idle : ImportState()
data object ResolvingIdentifier : ImportState() data object ResolvingIdentifier : ImportState()
data class IdentifierResolved(val pubkey: String) : ImportState()
data class IdentifierResolved(
val pubkey: String,
) : ImportState()
data object FetchingFollowList : ImportState() data object FetchingFollowList : ImportState()
data class FollowListLoaded(val sourcePubkey: String) : ImportState()
data class Error(val message: String) : ImportState() data class FollowListLoaded(
val sourcePubkey: String,
) : ImportState()
data class Error(
val message: String,
) : ImportState()
data object Publishing : ImportState() data object Publishing : ImportState()
data object Done : ImportState() data object Done : ImportState()
} }
@@ -123,7 +134,9 @@ private suspend fun resolveNip05Http(identifier: String): String? {
val url = "https://$domain/.well-known/nostr.json?name=$encodedName" val url = "https://$domain/.well-known/nostr.json?name=$encodedName"
return withContext(Dispatchers.IO) { return withContext(Dispatchers.IO) {
try { try {
val client = OkHttpClient.Builder() val client =
OkHttpClient
.Builder()
.connectTimeout(10, TimeUnit.SECONDS) .connectTimeout(10, TimeUnit.SECONDS)
.readTimeout(10, TimeUnit.SECONDS) .readTimeout(10, TimeUnit.SECONDS)
.build() .build()
@@ -201,7 +214,8 @@ fun ImportFollowListDialog(
relayManager.subscribe( relayManager.subscribe(
subId = subId, subId = subId,
filters = listOf( filters =
listOf(
Filter( Filter(
kinds = listOf(ContactListEvent.KIND), kinds = listOf(ContactListEvent.KIND),
authors = listOf(pubkey), authors = listOf(pubkey),
@@ -209,7 +223,8 @@ fun ImportFollowListDialog(
), ),
), ),
relays = relays, relays = relays,
listener = object : SubscriptionListener { listener =
object : SubscriptionListener {
override fun onEvent( override fun onEvent(
event: Event, event: Event,
isLive: Boolean, isLive: Boolean,
@@ -218,7 +233,8 @@ fun ImportFollowListDialog(
) { ) {
if (event.kind == ContactListEvent.KIND && !receivedContactList) { if (event.kind == ContactListEvent.KIND && !receivedContactList) {
receivedContactList = true receivedContactList = true
val contactList = ContactListEvent( val contactList =
ContactListEvent(
event.id, event.id,
event.pubKey, event.pubKey,
event.createdAt, event.createdAt,
@@ -241,7 +257,8 @@ fun ImportFollowListDialog(
// Clean up the contact list subscription // Clean up the contact list subscription
try { try {
relayManager.unsubscribe(subId) relayManager.unsubscribe(subId)
} catch (_: Exception) {} } catch (_: Exception) {
}
activeSubscriptions.remove(subId) activeSubscriptions.remove(subId)
// Start fetching metadata for display names // Start fetching metadata for display names
@@ -250,14 +267,16 @@ fun ImportFollowListDialog(
activeSubscriptions.add(metaSubId) activeSubscriptions.add(metaSubId)
relayManager.subscribe( relayManager.subscribe(
subId = metaSubId, subId = metaSubId,
filters = listOf( filters =
listOf(
Filter( Filter(
kinds = listOf(MetadataEvent.KIND), kinds = listOf(MetadataEvent.KIND),
authors = follows, authors = follows,
limit = follows.size, limit = follows.size,
), ),
), ),
listener = object : SubscriptionListener { listener =
object : SubscriptionListener {
override fun onEvent( override fun onEvent(
event: Event, event: Event,
isLive: Boolean, isLive: Boolean,
@@ -265,7 +284,8 @@ fun ImportFollowListDialog(
forFilters: List<Filter>?, forFilters: List<Filter>?,
) { ) {
if (event.kind == MetadataEvent.KIND) { if (event.kind == MetadataEvent.KIND) {
val bestName = try { val bestName =
try {
val metaJson = jacksonObjectMapper().readTree(event.content) val metaJson = jacksonObjectMapper().readTree(event.content)
metaJson.get("display_name")?.asText()?.takeIf { it.isNotBlank() } metaJson.get("display_name")?.asText()?.takeIf { it.isNotBlank() }
?: metaJson.get("name")?.asText()?.takeIf { it.isNotBlank() } ?: metaJson.get("name")?.asText()?.takeIf { it.isNotBlank() }
@@ -300,7 +320,8 @@ fun ImportFollowListDialog(
if (metaSubId in activeSubscriptions) { if (metaSubId in activeSubscriptions) {
try { try {
relayManager.unsubscribe(metaSubId) relayManager.unsubscribe(metaSubId)
} catch (_: Exception) {} } catch (_: Exception) {
}
activeSubscriptions.remove(metaSubId) activeSubscriptions.remove(metaSubId)
} }
} }
@@ -322,7 +343,8 @@ fun ImportFollowListDialog(
if (importState is ImportState.FetchingFollowList) { if (importState is ImportState.FetchingFollowList) {
try { try {
relayManager.unsubscribe(subId) relayManager.unsubscribe(subId)
} catch (_: Exception) {} } catch (_: Exception) {
}
activeSubscriptions.remove(subId) activeSubscriptions.remove(subId)
if (followEntries.isEmpty()) { if (followEntries.isEmpty()) {
importState = ImportState.Error("No follow list found for this user. They may not have published a contact list.") importState = ImportState.Error("No follow list found for this user. They may not have published a contact list.")
@@ -418,7 +440,8 @@ fun ImportFollowListDialog(
scope.launch { scope.launch {
try { try {
val contactTags = selected.map { ContactTag(it.pubkey) } val contactTags = selected.map { ContactTag(it.pubkey) }
val newContactList = ContactListEvent.createFromScratch( val newContactList =
ContactListEvent.createFromScratch(
followUsers = contactTags, followUsers = contactTags,
relayUse = null, relayUse = null,
signer = account.signer, signer = account.signer,
@@ -457,7 +480,8 @@ fun ImportFollowListDialog(
Spacer(Modifier.height(16.dp)) Spacer(Modifier.height(16.dp))
// Input field + Resolve button (shown in Idle and Error states) // Input field + Resolve button (shown in Idle and Error states)
val showInput = importState is ImportState.Idle || val showInput =
importState is ImportState.Idle ||
importState is ImportState.Error || importState is ImportState.Error ||
importState is ImportState.ResolvingIdentifier importState is ImportState.ResolvingIdentifier
if (showInput) { if (showInput) {
@@ -478,10 +502,12 @@ fun ImportFollowListDialog(
placeholder = { Text("npub1..., alice@example.com, d/alice") }, placeholder = { Text("npub1..., alice@example.com, d/alice") },
singleLine = true, singleLine = true,
isError = importState is ImportState.Error, isError = importState is ImportState.Error,
supportingText = (importState as? ImportState.Error)?.let { err -> supportingText =
(importState as? ImportState.Error)?.let { err ->
{ Text(err.message, color = MaterialTheme.colorScheme.error) } { Text(err.message, color = MaterialTheme.colorScheme.error) }
}, },
modifier = Modifier.weight(1f).onPreviewKeyEvent { event -> modifier =
Modifier.weight(1f).onPreviewKeyEvent { event ->
if (event.type == KeyEventType.KeyDown && event.key == Key.Enter) { if (event.type == KeyEventType.KeyDown && event.key == Key.Enter) {
resolveIdentifier() resolveIdentifier()
true true
@@ -566,7 +592,7 @@ fun ImportFollowListDialog(
) )
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
Icon( Icon(
Icons.Default.Person, MaterialSymbols.Person,
contentDescription = null, contentDescription = null,
modifier = Modifier.size(16.dp), modifier = Modifier.size(16.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant, tint = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -583,7 +609,8 @@ fun ImportFollowListDialog(
"${entry.pubkey.take(12)}…${entry.pubkey.takeLast(8)}", "${entry.pubkey.take(12)}…${entry.pubkey.takeLast(8)}",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
fontFamily = FontFamily.Monospace, fontFamily = FontFamily.Monospace,
color = if (entry.displayName != null) { color =
if (entry.displayName != null) {
MaterialTheme.colorScheme.onSurfaceVariant MaterialTheme.colorScheme.onSurfaceVariant
} else { } else {
MaterialTheme.colorScheme.onSurface MaterialTheme.colorScheme.onSurface
@@ -618,7 +645,7 @@ fun ImportFollowListDialog(
horizontalArrangement = Arrangement.spacedBy(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
Icon( Icon(
Icons.Default.CheckCircle, MaterialSymbols.CheckCircle,
contentDescription = null, contentDescription = null,
tint = MaterialTheme.colorScheme.primary, tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(24.dp), modifier = Modifier.size(24.dp),
desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/SearchScreen.kt
+30 -14
View File
@@ -78,6 +78,7 @@ import com.vitorpamplona.amethyst.commons.feeds.custom.canBecomeFeed
import com.vitorpamplona.amethyst.commons.feeds.custom.toFeedDefinition import com.vitorpamplona.amethyst.commons.feeds.custom.toFeedDefinition
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.NamecoinResolveState
import com.vitorpamplona.amethyst.commons.search.AdvancedSearchBarState import com.vitorpamplona.amethyst.commons.search.AdvancedSearchBarState
import com.vitorpamplona.amethyst.commons.search.QuerySerializer import com.vitorpamplona.amethyst.commons.search.QuerySerializer
import com.vitorpamplona.amethyst.commons.search.SavedSearch import com.vitorpamplona.amethyst.commons.search.SavedSearch
@@ -89,6 +90,8 @@ import com.vitorpamplona.amethyst.desktop.SearchHistoryStore
import com.vitorpamplona.amethyst.desktop.account.AccountState import com.vitorpamplona.amethyst.desktop.account.AccountState
import com.vitorpamplona.amethyst.desktop.cache.DesktopLocalCache import com.vitorpamplona.amethyst.desktop.cache.DesktopLocalCache
import com.vitorpamplona.amethyst.desktop.network.DesktopRelayConnectionManager import com.vitorpamplona.amethyst.desktop.network.DesktopRelayConnectionManager
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinPreferences
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinService
import com.vitorpamplona.amethyst.desktop.subscriptions.DesktopRelaySubscriptionsCoordinator import com.vitorpamplona.amethyst.desktop.subscriptions.DesktopRelaySubscriptionsCoordinator
import com.vitorpamplona.amethyst.desktop.subscriptions.SearchFilterFactory import com.vitorpamplona.amethyst.desktop.subscriptions.SearchFilterFactory
import com.vitorpamplona.amethyst.desktop.subscriptions.SubscriptionConfig import com.vitorpamplona.amethyst.desktop.subscriptions.SubscriptionConfig
@@ -102,15 +105,10 @@ import com.vitorpamplona.amethyst.desktop.ui.relay.SearchRelayEditor
import com.vitorpamplona.amethyst.desktop.ui.search.AdvancedSearchPanel import com.vitorpamplona.amethyst.desktop.ui.search.AdvancedSearchPanel
import com.vitorpamplona.amethyst.desktop.ui.search.SearchResultsList import com.vitorpamplona.amethyst.desktop.ui.search.SearchResultsList
import com.vitorpamplona.amethyst.desktop.ui.search.SearchSyncBanner import com.vitorpamplona.amethyst.desktop.ui.search.SearchSyncBanner
import com.vitorpamplona.amethyst.desktop.service.namecoin.DesktopNamecoinNameService
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinPreferences
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinService
import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.NamecoinResolveState
import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinNameResolver import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinNameResolver
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinResolveOutcome import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.NamecoinResolveOutcome
import com.vitorpamplona.quartz.nip19Bech32.decodePublicKeyAsHexOrNull import com.vitorpamplona.quartz.nip19Bech32.decodePublicKeyAsHexOrNull
import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@Composable @Composable
@@ -166,8 +164,14 @@ fun SearchScreen(
// Namecoin resolution // Namecoin resolution
val namecoinService = LocalNamecoinService.current val namecoinService = LocalNamecoinService.current
val namecoinPrefs = LocalNamecoinPreferences.current val namecoinPrefs = LocalNamecoinPreferences.current
val namecoinEnabled = namecoinPrefs?.settings?.collectAsState()?.value?.enabled ?: false val namecoinEnabled =
val isNamecoinQuery = remember(displayText) { namecoinPrefs
?.settings
?.collectAsState()
?.value
?.enabled ?: false
val isNamecoinQuery =
remember(displayText) {
displayText.isNotBlank() && NamecoinNameResolver.isNamecoinIdentifier(displayText.trim()) displayText.isNotBlank() && NamecoinNameResolver.isNamecoinIdentifier(displayText.trim())
} }
@@ -183,21 +187,33 @@ fun SearchScreen(
} }
namecoinState = NamecoinResolveState.Loading namecoinState = NamecoinResolveState.Loading
val outcome = namecoinService.resolveDetailed(displayText.trim()) val outcome = namecoinService.resolveDetailed(displayText.trim())
namecoinState = when (outcome) { namecoinState =
is NamecoinResolveOutcome.Success -> when (outcome) {
is NamecoinResolveOutcome.Success -> {
NamecoinResolveState.Resolved(outcome.result) NamecoinResolveState.Resolved(outcome.result)
is NamecoinResolveOutcome.NameNotFound -> }
is NamecoinResolveOutcome.NameNotFound -> {
NamecoinResolveState.NotFound NamecoinResolveState.NotFound
is NamecoinResolveOutcome.NoNostrField -> }
is NamecoinResolveOutcome.NoNostrField -> {
NamecoinResolveState.Error("Name exists but has no Nostr pubkey") NamecoinResolveState.Error("Name exists but has no Nostr pubkey")
is NamecoinResolveOutcome.ServersUnreachable -> }
is NamecoinResolveOutcome.ServersUnreachable -> {
NamecoinResolveState.Error("ElectrumX servers unreachable — check your connection or try again") NamecoinResolveState.Error("ElectrumX servers unreachable — check your connection or try again")
is NamecoinResolveOutcome.InvalidIdentifier -> }
is NamecoinResolveOutcome.InvalidIdentifier -> {
NamecoinResolveState.Error("Invalid Namecoin identifier") NamecoinResolveState.Error("Invalid Namecoin identifier")
is NamecoinResolveOutcome.Timeout -> }
is NamecoinResolveOutcome.Timeout -> {
NamecoinResolveState.Error("Resolution timed out — servers may be slow, try again") NamecoinResolveState.Error("Resolution timed out — servers may be slow, try again")
} }
} }
}
// Skip people search when query specifies kinds that don't include profile (kind 0) // Skip people search when query specifies kinds that don't include profile (kind 0)
val shouldSearchPeople = val shouldSearchPeople =
desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/DeckColumnContainer.kt
+1 -1
View File
@@ -38,7 +38,6 @@ import androidx.compose.ui.unit.dp
import com.vitorpamplona.amethyst.desktop.DesktopScreen import com.vitorpamplona.amethyst.desktop.DesktopScreen
import com.vitorpamplona.amethyst.desktop.RelaySettingsScreen import com.vitorpamplona.amethyst.desktop.RelaySettingsScreen
import com.vitorpamplona.amethyst.desktop.account.AccountManager import com.vitorpamplona.amethyst.desktop.account.AccountManager
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinPreferences
import com.vitorpamplona.amethyst.desktop.account.AccountState import com.vitorpamplona.amethyst.desktop.account.AccountState
import com.vitorpamplona.amethyst.desktop.cache.DesktopLocalCache import com.vitorpamplona.amethyst.desktop.cache.DesktopLocalCache
import com.vitorpamplona.amethyst.desktop.chess.ChessScreen import com.vitorpamplona.amethyst.desktop.chess.ChessScreen
@@ -47,6 +46,7 @@ import com.vitorpamplona.amethyst.desktop.network.DesktopRelayConnectionManager
import com.vitorpamplona.amethyst.desktop.network.Nip11Fetcher import com.vitorpamplona.amethyst.desktop.network.Nip11Fetcher
import com.vitorpamplona.amethyst.desktop.service.drafts.DesktopDraftStore import com.vitorpamplona.amethyst.desktop.service.drafts.DesktopDraftStore
import com.vitorpamplona.amethyst.desktop.service.highlights.DesktopHighlightStore import com.vitorpamplona.amethyst.desktop.service.highlights.DesktopHighlightStore
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinPreferences
import com.vitorpamplona.amethyst.desktop.subscriptions.DesktopRelaySubscriptionsCoordinator import com.vitorpamplona.amethyst.desktop.subscriptions.DesktopRelaySubscriptionsCoordinator
import com.vitorpamplona.amethyst.desktop.subscriptions.FeedMode import com.vitorpamplona.amethyst.desktop.subscriptions.FeedMode
import com.vitorpamplona.amethyst.desktop.ui.ArticleEditorScreen import com.vitorpamplona.amethyst.desktop.ui.ArticleEditorScreen
desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/settings/NamecoinSettingsSection.kt
+25 -21
View File
@@ -34,13 +34,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Lock
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
@@ -66,6 +60,8 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.NamecoinSettings import com.vitorpamplona.amethyst.commons.model.nip05DnsIdentifiers.namecoin.NamecoinSettings
import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.DEFAULT_ELECTRUMX_SERVERS import com.vitorpamplona.quartz.nip05DnsIdentifiers.namecoin.DEFAULT_ELECTRUMX_SERVERS
@@ -143,7 +139,7 @@ fun NamecoinSettingsSection(
) { ) {
TextButton(onClick = onReset) { TextButton(onClick = onReset) {
Icon( Icon(
Icons.Default.Refresh, MaterialSymbols.Refresh,
contentDescription = null, contentDescription = null,
modifier = Modifier.size(16.dp), modifier = Modifier.size(16.dp),
) )
@@ -171,7 +167,7 @@ private fun NamecoinSectionHeader(
) { ) {
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Icon( Icon(
Icons.Default.Lock, MaterialSymbols.Lock,
contentDescription = null, contentDescription = null,
tint = Color(0xFF4A90D9), // Namecoin blue tint = Color(0xFF4A90D9), // Namecoin blue
modifier = Modifier.size(22.dp), modifier = Modifier.size(22.dp),
@@ -219,12 +215,12 @@ private fun NamecoinActiveServersDisplay(settings: NamecoinSettings) {
style = MaterialTheme.typography.labelSmall, style = MaterialTheme.typography.labelSmall,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = Color(0xFF4A90D9), color = Color(0xFF4A90D9),
modifier = Modifier modifier =
Modifier
.background( .background(
Color(0xFF4A90D9).copy(alpha = 0.1f), Color(0xFF4A90D9).copy(alpha = 0.1f),
RoundedCornerShape(4.dp), RoundedCornerShape(4.dp),
) ).padding(horizontal = 6.dp, vertical = 2.dp),
.padding(horizontal = 6.dp, vertical = 2.dp),
) )
} else { } else {
Text( Text(
@@ -237,7 +233,8 @@ private fun NamecoinActiveServersDisplay(settings: NamecoinSettings) {
Spacer(Modifier.height(6.dp)) Spacer(Modifier.height(6.dp))
servers.forEach { server -> servers.forEach { server ->
NamecoinServerRow( NamecoinServerRow(
displayText = "${server.host}:${server.port}" + displayText =
"${server.host}:${server.port}" +
if (!server.useSsl) " (tcp)" else " (tls)", if (!server.useSsl) " (tcp)" else " (tls)",
isActive = true, isActive = true,
) )
@@ -266,7 +263,8 @@ private fun NamecoinCustomServersList(
) )
servers.forEach { server -> servers.forEach { server ->
Row( Row(
modifier = Modifier modifier =
Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 2.dp), .padding(vertical = 2.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
@@ -285,7 +283,7 @@ private fun NamecoinCustomServersList(
modifier = Modifier.size(28.dp), modifier = Modifier.size(28.dp),
) { ) {
Icon( Icon(
Icons.Default.Close, MaterialSymbols.Close,
contentDescription = "Remove server", contentDescription = "Remove server",
tint = MaterialTheme.colorScheme.error, tint = MaterialTheme.colorScheme.error,
modifier = Modifier.size(16.dp), modifier = Modifier.size(16.dp),
@@ -332,10 +330,12 @@ private fun NamecoinAddServerInput(onAdd: (String) -> Unit) {
placeholder = { Text("host:port or host:port:tcp") }, placeholder = { Text("host:port or host:port:tcp") },
singleLine = true, singleLine = true,
isError = validationError != null, isError = validationError != null,
supportingText = validationError?.let { err -> supportingText =
validationError?.let { err ->
{ Text(err, color = MaterialTheme.colorScheme.error) } { Text(err, color = MaterialTheme.colorScheme.error) }
}, },
modifier = Modifier modifier =
Modifier
.weight(1f) .weight(1f)
.onPreviewKeyEvent { event -> .onPreviewKeyEvent { event ->
if (event.type == KeyEventType.KeyDown && event.key == Key.Enter) { if (event.type == KeyEventType.KeyDown && event.key == Key.Enter) {
@@ -346,14 +346,16 @@ private fun NamecoinAddServerInput(onAdd: (String) -> Unit) {
} }
}, },
shape = RoundedCornerShape(8.dp), shape = RoundedCornerShape(8.dp),
textStyle = MaterialTheme.typography.bodySmall.copy( textStyle =
MaterialTheme.typography.bodySmall.copy(
fontFamily = FontFamily.Monospace, fontFamily = FontFamily.Monospace,
), ),
) )
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
IconButton( IconButton(
onClick = { tryAdd() }, onClick = { tryAdd() },
modifier = Modifier modifier =
Modifier
.padding(top = 8.dp) .padding(top = 8.dp)
.size(40.dp) .size(40.dp)
.background( .background(
@@ -362,7 +364,7 @@ private fun NamecoinAddServerInput(onAdd: (String) -> Unit) {
), ),
) { ) {
Icon( Icon(
Icons.Default.Add, MaterialSymbols.Add,
contentDescription = "Add server", contentDescription = "Add server",
tint = MaterialTheme.colorScheme.primary, tint = MaterialTheme.colorScheme.primary,
) )
@@ -376,7 +378,8 @@ private fun NamecoinServerRow(
isActive: Boolean, isActive: Boolean,
) { ) {
Row( Row(
modifier = Modifier modifier =
Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 2.dp), .padding(vertical = 2.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
@@ -384,7 +387,8 @@ private fun NamecoinServerRow(
Text( Text(
text = "•", text = "•",
fontSize = 10.sp, fontSize = 10.sp,
color = if (isActive) { color =
if (isActive) {
Color(0xFF2E8B57) Color(0xFF2E8B57)
} else { } else {
MaterialTheme.colorScheme.onSurfaceVariant MaterialTheme.colorScheme.onSurfaceVariant
desktopApp/src/jvmTest/kotlin/com/vitorpamplona/amethyst/desktop/service/namecoin/DesktopNamecoinPreferencesTest.kt
+16 -8
View File
@@ -57,7 +57,8 @@ class DesktopNamecoinPreferencesTest {
} }
@Test @Test
fun `setEnabled persists and updates flow`() = runBlocking { fun `setEnabled persists and updates flow`() =
runBlocking {
namecoinPrefs.setEnabled(false) namecoinPrefs.setEnabled(false)
assertFalse(namecoinPrefs.current.enabled) assertFalse(namecoinPrefs.current.enabled)
assertFalse(namecoinPrefs.settings.value.enabled) assertFalse(namecoinPrefs.settings.value.enabled)
@@ -68,7 +69,8 @@ class DesktopNamecoinPreferencesTest {
} }
@Test @Test
fun `addServer persists and updates flow`() = runBlocking { fun `addServer persists and updates flow`() =
runBlocking {
namecoinPrefs.addServer("example.com:50006") namecoinPrefs.addServer("example.com:50006")
assertEquals(listOf("example.com:50006"), namecoinPrefs.current.customServers) assertEquals(listOf("example.com:50006"), namecoinPrefs.current.customServers)
assertTrue(namecoinPrefs.current.hasCustomServers) assertTrue(namecoinPrefs.current.hasCustomServers)
@@ -79,21 +81,24 @@ class DesktopNamecoinPreferencesTest {
} }
@Test @Test
fun `addServer ignores blank strings`() = runBlocking { fun `addServer ignores blank strings`() =
runBlocking {
namecoinPrefs.addServer("") namecoinPrefs.addServer("")
namecoinPrefs.addServer(" ") namecoinPrefs.addServer(" ")
assertTrue(namecoinPrefs.current.customServers.isEmpty()) assertTrue(namecoinPrefs.current.customServers.isEmpty())
} }
@Test @Test
fun `addServer ignores duplicates`() = runBlocking { fun `addServer ignores duplicates`() =
runBlocking {
namecoinPrefs.addServer("example.com:50006") namecoinPrefs.addServer("example.com:50006")
namecoinPrefs.addServer("example.com:50006") namecoinPrefs.addServer("example.com:50006")
assertEquals(1, namecoinPrefs.current.customServers.size) assertEquals(1, namecoinPrefs.current.customServers.size)
} }
@Test @Test
fun `removeServer persists and updates flow`() = runBlocking { fun `removeServer persists and updates flow`() =
runBlocking {
namecoinPrefs.addServer("server1.com:50006") namecoinPrefs.addServer("server1.com:50006")
namecoinPrefs.addServer("server2.com:50001:tcp") namecoinPrefs.addServer("server2.com:50001:tcp")
assertEquals(2, namecoinPrefs.current.customServers.size) assertEquals(2, namecoinPrefs.current.customServers.size)
@@ -107,7 +112,8 @@ class DesktopNamecoinPreferencesTest {
} }
@Test @Test
fun `reset restores defaults`() = runBlocking { fun `reset restores defaults`() =
runBlocking {
namecoinPrefs.setEnabled(false) namecoinPrefs.setEnabled(false)
namecoinPrefs.addServer("example.com:50006") namecoinPrefs.addServer("example.com:50006")
assertFalse(namecoinPrefs.current.enabled) assertFalse(namecoinPrefs.current.enabled)
@@ -129,7 +135,8 @@ class DesktopNamecoinPreferencesTest {
} }
@Test @Test
fun `customServersOrNull returns parsed servers when configured`() = runBlocking { fun `customServersOrNull returns parsed servers when configured`() =
runBlocking {
namecoinPrefs.addServer("example.com:50006") namecoinPrefs.addServer("example.com:50006")
val servers = namecoinPrefs.customServersOrNull val servers = namecoinPrefs.customServersOrNull
assertEquals(1, servers?.size) assertEquals(1, servers?.size)
@@ -139,7 +146,8 @@ class DesktopNamecoinPreferencesTest {
} }
@Test @Test
fun `round-trip multiple operations`() = runBlocking { fun `round-trip multiple operations`() =
runBlocking {
namecoinPrefs.setEnabled(true) namecoinPrefs.setEnabled(true)
namecoinPrefs.addServer("server1.com:50006") namecoinPrefs.addServer("server1.com:50006")
namecoinPrefs.addServer("onion.onion:50001:tcp") namecoinPrefs.addServer("onion.onion:50001:tcp")