From 2bff99834002e966ff32ac95426de69952bab9ae Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 21 Nov 2025 15:18:31 -0500 Subject: [PATCH] Moves from List to Set of Trust Provider --- .../trustedAssertions/TrustProviderListDecryptionCache.kt | 5 +++++ .../model/trustedAssertions/TrustProviderListState.kt | 2 +- .../experimental/trustedAssertions/list/TagArrayExt.kt | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListDecryptionCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListDecryptionCache.kt index 6a4321978..c35dfbaac 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListDecryptionCache.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListDecryptionCache.kt @@ -21,6 +21,7 @@ package com.vitorpamplona.amethyst.model.trustedAssertions import com.vitorpamplona.quartz.experimental.trustedAssertions.list.TrustProviderListEvent +import com.vitorpamplona.quartz.experimental.trustedAssertions.list.serviceProviderSet import com.vitorpamplona.quartz.experimental.trustedAssertions.list.serviceProviders import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache @@ -32,5 +33,9 @@ class TrustProviderListDecryptionCache( fun cachedServiceProviders(event: TrustProviderListEvent) = cachedPrivateLists.mergeTagListPrecached(event).serviceProviders() + fun cachedServiceProviderSet(event: TrustProviderListEvent) = cachedPrivateLists.mergeTagListPrecached(event).serviceProviderSet() + suspend fun serviceProviders(event: TrustProviderListEvent) = cachedPrivateLists.mergeTagList(event).serviceProviders() + + suspend fun serviceProviderSet(event: TrustProviderListEvent) = cachedPrivateLists.mergeTagList(event).serviceProviderSet() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListState.kt index 5e97b53fe..ec79f5a4e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListState.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListState.kt @@ -59,7 +59,7 @@ class TrustProviderListState( suspend fun trustProviderListWithBackup(note: Note): Set { val event = note.event as? TrustProviderListEvent ?: settings.backupTrustProviderList - return event?.let { decryptionCache.roomSet(it) } ?: emptySet() + return event?.let { decryptionCache.serviceProviderSet(it) } ?: emptySet() } @OptIn(ExperimentalCoroutinesApi::class) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/trustedAssertions/list/TagArrayExt.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/trustedAssertions/list/TagArrayExt.kt index 5f44f5ea4..de6eec972 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/trustedAssertions/list/TagArrayExt.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/trustedAssertions/list/TagArrayExt.kt @@ -20,7 +20,10 @@ */ package com.vitorpamplona.quartz.experimental.trustedAssertions.list +import com.vitorpamplona.quartz.experimental.ephemChat.list.tags.RoomIdTag.Companion.parse import com.vitorpamplona.quartz.experimental.trustedAssertions.list.tags.ServiceProviderTag import com.vitorpamplona.quartz.nip01Core.core.TagArray fun TagArray.serviceProviders() = mapNotNull(ServiceProviderTag::parse) + +fun TagArray.serviceProviderSet() = mapNotNullTo(mutableSetOf(), ServiceProviderTag::parse)