Moves from List to Set of Trust Provider
This commit is contained in:
+5
@@ -21,6 +21,7 @@
|
|||||||
package com.vitorpamplona.amethyst.model.trustedAssertions
|
package com.vitorpamplona.amethyst.model.trustedAssertions
|
||||||
|
|
||||||
import com.vitorpamplona.quartz.experimental.trustedAssertions.list.TrustProviderListEvent
|
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.experimental.trustedAssertions.list.serviceProviders
|
||||||
import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
|
import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
|
||||||
import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
|
import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
|
||||||
@@ -32,5 +33,9 @@ class TrustProviderListDecryptionCache(
|
|||||||
|
|
||||||
fun cachedServiceProviders(event: TrustProviderListEvent) = cachedPrivateLists.mergeTagListPrecached(event).serviceProviders()
|
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 serviceProviders(event: TrustProviderListEvent) = cachedPrivateLists.mergeTagList(event).serviceProviders()
|
||||||
|
|
||||||
|
suspend fun serviceProviderSet(event: TrustProviderListEvent) = cachedPrivateLists.mergeTagList(event).serviceProviderSet()
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -59,7 +59,7 @@ class TrustProviderListState(
|
|||||||
|
|
||||||
suspend fun trustProviderListWithBackup(note: Note): Set<ServiceProviderTag> {
|
suspend fun trustProviderListWithBackup(note: Note): Set<ServiceProviderTag> {
|
||||||
val event = note.event as? TrustProviderListEvent ?: settings.backupTrustProviderList
|
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)
|
@OptIn(ExperimentalCoroutinesApi::class)
|
||||||
|
|||||||
+3
@@ -20,7 +20,10 @@
|
|||||||
*/
|
*/
|
||||||
package com.vitorpamplona.quartz.experimental.trustedAssertions.list
|
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.experimental.trustedAssertions.list.tags.ServiceProviderTag
|
||||||
import com.vitorpamplona.quartz.nip01Core.core.TagArray
|
import com.vitorpamplona.quartz.nip01Core.core.TagArray
|
||||||
|
|
||||||
fun TagArray.serviceProviders() = mapNotNull(ServiceProviderTag::parse)
|
fun TagArray.serviceProviders() = mapNotNull(ServiceProviderTag::parse)
|
||||||
|
|
||||||
|
fun TagArray.serviceProviderSet() = mapNotNullTo(mutableSetOf(), ServiceProviderTag::parse)
|
||||||
|
|||||||
Reference in New Issue
Block a user