From 4a4f03c12b45291462e840d433be2e1e6056b343 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 15 Jan 2025 09:56:15 -0500 Subject: [PATCH] Refactor proxyTag function names --- .../com/vitorpamplona/quartz/nip48ProxyTags/EventExt.kt | 6 +++--- .../quartz/nip48ProxyTags/TagArrayBuilderExt.kt | 2 ++ .../com/vitorpamplona/quartz/nip48ProxyTags/TagArrayExt.kt | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/EventExt.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/EventExt.kt index 8357a15d0..4398e0adb 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/EventExt.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/EventExt.kt @@ -22,8 +22,8 @@ package com.vitorpamplona.quartz.nip48ProxyTags import com.vitorpamplona.quartz.nip01Core.core.Event -fun Event.taggedProxies() = tags.taggedProxies() +fun Event.taggedProxies() = tags.proxies() -fun Event.firstTaggedProxy() = tags.firstTaggedProxy() +fun Event.firstTaggedProxy() = tags.firstProxy() -fun Event.hasAnyTaggedProxy() = tags.hasAnyTaggedProxy() +fun Event.hasTaggedProxy() = tags.hasProxy() diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/TagArrayBuilderExt.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/TagArrayBuilderExt.kt index 21e12bf74..4c7af5e9a 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/TagArrayBuilderExt.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/TagArrayBuilderExt.kt @@ -31,3 +31,5 @@ fun TagArrayBuilder.proxy( id: String, pt: String, ) = add(ProxyTag.assemble(id, pt)) + +fun TagArrayBuilder.proxy(tag: ProxyTag) = add(tag.toTagArray()) diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/TagArrayExt.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/TagArrayExt.kt index 6b74a8c9d..ac1b87518 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/TagArrayExt.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip48ProxyTags/TagArrayExt.kt @@ -25,8 +25,8 @@ import com.vitorpamplona.quartz.nip01Core.core.firstTagValue import com.vitorpamplona.quartz.nip01Core.core.hasTagWithContent import com.vitorpamplona.quartz.nip01Core.core.mapValues -fun TagArray.taggedProxies() = this.mapValues(ProxyTag.TAG_NAME) +fun TagArray.proxies() = this.mapValues(ProxyTag.TAG_NAME) -fun TagArray.firstTaggedProxy() = this.firstTagValue(ProxyTag.TAG_NAME) +fun TagArray.firstProxy() = this.firstTagValue(ProxyTag.TAG_NAME) -fun TagArray.hasAnyTaggedProxy() = this.hasTagWithContent(ProxyTag.TAG_NAME) +fun TagArray.hasProxy() = this.hasTagWithContent(ProxyTag.TAG_NAME)