diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Dao.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Dao.kt index c1e3443d94..00062654eb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Dao.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Dao.kt @@ -29,7 +29,7 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey * needing the full [LocalCache] API. */ interface Dao { - fun getOrCreateUser(hex: HexKey): User + fun getOrCreateUser(pubkey: HexKey): User fun getOrCreateNote(hex: HexKey): Note diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt index 7ffa080688..9df341c771 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -685,12 +685,12 @@ object LocalCache : ILocalCache, ICacheProvider, Dao { fun load(keys: Set): Set = keys.mapNotNullTo(mutableSetOf(), ::checkGetOrCreateUser) - override fun getOrCreateUser(hex: HexKey): User { - require(isValidHex(key = hex)) { "$hex is not a valid hex" } + override fun getOrCreateUser(pubkey: HexKey): User { + require(isValidHex(key = pubkey)) { "$pubkey is not a valid hex" } // Pass `this` as the UserContext — User now resolves each pinned // addressable note (kind:10002 / 10050 / 10019) lazily on first // read, instead of all-or-nothing at construction time. - return users.getOrCreate(hex) { User(it, userContext) } + return users.getOrCreate(pubkey) { User(it, userContext) } } /** [UserContext] bridge to this cache's addressable lookup. */ diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt index f27b3215c9..490f853b80 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt @@ -2106,7 +2106,7 @@ class AccountViewModel( fun checkGetOrCreateUser(key: HexKey): User? = LocalCache.checkGetOrCreateUser(key) - override fun getOrCreateUser(hex: HexKey): User = LocalCache.getOrCreateUser(hex) + override fun getOrCreateUser(pubkey: HexKey): User = LocalCache.getOrCreateUser(pubkey) fun getUserIfExists(hex: HexKey): User? = LocalCache.getUserIfExists(hex) diff --git a/amethyst/src/test/java/com/vitorpamplona/amethyst/NewMessageTaggerKeyParseTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/NewMessageTaggerKeyParseTest.kt index dba6e87238..b73dbfd3fc 100644 --- a/amethyst/src/test/java/com/vitorpamplona/amethyst/NewMessageTaggerKeyParseTest.kt +++ b/amethyst/src/test/java/com/vitorpamplona/amethyst/NewMessageTaggerKeyParseTest.kt @@ -39,7 +39,7 @@ import org.junit.Test class NewMessageTaggerKeyParseTest { val dao: Dao = object : Dao { - override fun getOrCreateUser(hex: String): User = User(hex) { addr -> getOrCreateAddressableNoteInternal(addr) } + override fun getOrCreateUser(pubkey: String): User = User(pubkey) { addr -> getOrCreateAddressableNoteInternal(addr) } override fun getOrCreateNote(hex: String) = com.vitorpamplona.amethyst.model diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/cache/ICacheProvider.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/cache/ICacheProvider.kt index e4b3ccd9ae..6bdb38532e 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/cache/ICacheProvider.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/cache/ICacheProvider.kt @@ -93,7 +93,7 @@ interface ICacheProvider { * @param address The note's ID in address format * @return The AddressableNote (existing or newly created) */ - fun getOrCreateAddressableNote(key: Address): AddressableNote + fun getOrCreateAddressableNote(address: Address): AddressableNote /** * Gets the event stream for cache updates. diff --git a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/ThreadAssemblerTest.kt b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/ThreadAssemblerTest.kt index e676dd6dc6..e2a25246a9 100644 --- a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/ThreadAssemblerTest.kt +++ b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/ThreadAssemblerTest.kt @@ -181,7 +181,7 @@ class ThreadAssemblerTest { override fun checkGetOrCreateNote(hexKey: HexKey): Note? = notesById[hexKey] - override fun getOrCreateAddressableNote(key: Address): AddressableNote = error("not used by ThreadAssembler in this test") + override fun getOrCreateAddressableNote(address: Address): AddressableNote = error("not used by ThreadAssembler in this test") override fun getEventStream(): ICacheEventStream = error("not used by ThreadAssembler in this test") diff --git a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/concord/ConcordChannelListLeaveTest.kt b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/concord/ConcordChannelListLeaveTest.kt index 2b4682326f..600a56a38b 100644 --- a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/concord/ConcordChannelListLeaveTest.kt +++ b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/concord/ConcordChannelListLeaveTest.kt @@ -90,7 +90,7 @@ class ConcordChannelListLeaveTest { override fun checkGetOrCreateNote(hexKey: HexKey): Note? = null - override fun getOrCreateAddressableNote(key: Address): AddressableNote = AddressableNote(key) + override fun getOrCreateAddressableNote(address: Address): AddressableNote = AddressableNote(address) override fun getEventStream(): ICacheEventStream = error("not used") diff --git a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/concord/ConcordListLateArrivalTest.kt b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/concord/ConcordListLateArrivalTest.kt index 366693b062..e4325e9280 100644 --- a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/concord/ConcordListLateArrivalTest.kt +++ b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/concord/ConcordListLateArrivalTest.kt @@ -88,7 +88,7 @@ class ConcordListLateArrivalTest { override fun checkGetOrCreateNote(hexKey: HexKey): Note? = null - override fun getOrCreateAddressableNote(key: Address): AddressableNote = notes.getOrPut(key.toValue()) { AddressableNote(key) } + override fun getOrCreateAddressableNote(address: Address): AddressableNote = notes.getOrPut(address.toValue()) { AddressableNote(address) } override fun getEventStream(): ICacheEventStream = error("not used") diff --git a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/ui/note/ReplyContextTest.kt b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/ui/note/ReplyContextTest.kt index e0d5791888..0a23769767 100644 --- a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/ui/note/ReplyContextTest.kt +++ b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/ui/note/ReplyContextTest.kt @@ -121,7 +121,7 @@ class ReplyContextTest { override fun checkGetOrCreateNote(hexKey: HexKey): Note? = notesById[hexKey] - override fun getOrCreateAddressableNote(key: Address): AddressableNote = error("not used by ReplyContext.from") + override fun getOrCreateAddressableNote(address: Address): AddressableNote = error("not used by ReplyContext.from") override fun getEventStream(): ICacheEventStream = error("not used by ReplyContext.from") diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/cache/DesktopLocalCache.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/cache/DesktopLocalCache.kt index af026c5746..b83d490a28 100644 --- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/cache/DesktopLocalCache.kt +++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/cache/DesktopLocalCache.kt @@ -904,9 +904,9 @@ class DesktopLocalCache : ICacheProvider { Note(hexKey) } - override fun getOrCreateAddressableNote(key: Address): AddressableNote = - addressableNotes.getOrCreate(key.toValue()) { - AddressableNote(key) + override fun getOrCreateAddressableNote(address: Address): AddressableNote = + addressableNotes.getOrCreate(address.toValue()) { + AddressableNote(address) } // ----- Channel operations ----- diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/server/policies/LimitsPolicy.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/server/policies/LimitsPolicy.kt index 3aaa3e3f32..e543fa5a41 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/server/policies/LimitsPolicy.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/server/policies/LimitsPolicy.kt @@ -128,8 +128,8 @@ class LimitsPolicy( */ private fun capLimits(filters: List): List { val max = limits.maxLimit ?: return filters - if (filters.none { it.limit != null && it.limit!! > max }) return filters - return filters.map { if (it.limit != null && it.limit!! > max) it.copy(limit = max) else it } + if (filters.none { it.limit != null && it.limit > max }) return filters + return filters.map { if (it.limit != null && it.limit > max) it.copy(limit = max) else it } } private fun targetLimit(current: Int?): Int? = diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/reachability/RelayProberFlowTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/reachability/RelayProberFlowTest.kt index 1cfdfcea00..f0a6be04ca 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/reachability/RelayProberFlowTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/reachability/RelayProberFlowTest.kt @@ -327,9 +327,9 @@ class RelayProberFlowTest { } check.join() - val verdict = result!![fast]!! - assertEquals(true, verdict.writeAccepted, "the listed relay's OK must still be awaited and recorded") - assertNull(result!![foreign], "the foreign relay must not appear in the result") + val verdicts = result!! + assertEquals(true, verdicts[fast]!!.writeAccepted, "the listed relay's OK must still be awaited and recorded") + assertNull(verdicts[foreign], "the foreign relay must not appear in the result") } @Test diff --git a/quartz/src/jvmTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/prodbench/NegentropyStallRepro.kt b/quartz/src/jvmTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/prodbench/NegentropyStallRepro.kt index c85e4fb80a..16ef708751 100644 --- a/quartz/src/jvmTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/prodbench/NegentropyStallRepro.kt +++ b/quartz/src/jvmTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/prodbench/NegentropyStallRepro.kt @@ -103,10 +103,10 @@ class NegentropyStallRepro { object : WebSocketListener { override fun onOpen( pingMillis: Int, - usingCompression: Boolean, + compression: Boolean, ) { - log(" [<-open] ${url.url} ping=${pingMillis}ms deflate=$usingCompression") - out.onOpen(pingMillis, usingCompression) + log(" [<-open] ${url.url} ping=${pingMillis}ms deflate=$compression") + out.onOpen(pingMillis, compression) } override suspend fun onMessage(text: String) { @@ -130,10 +130,10 @@ class NegentropyStallRepro { override fun onFailure( t: Throwable, code: Int?, - errorMessage: String?, + response: String?, ) { - log(" [<-failure] ${url.url} code=$code msg=$errorMessage err=${t.message}") - out.onFailure(t, code, errorMessage) + log(" [<-failure] ${url.url} code=$code msg=$response err=${t.message}") + out.onFailure(t, code, response) } }