From 98453c7b65884847255044facd68b7ca00795f9e Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 25 Aug 2025 10:26:39 -0400 Subject: [PATCH] Fixes unable to delete relays from some lists. --- .../quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt | 7 ++----- .../vitorpamplona/quartz/nip17Dm/settings/tags/RelayTag.kt | 2 +- .../vitorpamplona/quartz/nip42RelayAuth/tags/RelayTag.kt | 2 +- .../quartz/nip51Lists/relayLists/tags/RelayTag.kt | 2 +- .../com/vitorpamplona/quartz/nip51Lists/tags/RelayTag.kt | 2 +- .../quartz/nip62RequestToVanish/tags/RelayTag.kt | 2 +- .../quartz/nip65RelayList/tags/AdvertisedRelayInfoTag.kt | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt index 8c44924c2..94dc26f07 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt @@ -68,11 +68,8 @@ class ChatMessageRelayListEvent( val tags = earlierVersion.tags .filter(RelayTag::notMatch) - .plus( - relays.map { - RelayTag.assemble(it) - }, - ).toTypedArray() + .plus(relays.map { RelayTag.assemble(it) }) + .toTypedArray() return signer.sign(createdAt, KIND, tags, earlierVersion.content) } diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/settings/tags/RelayTag.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/settings/tags/RelayTag.kt index d1c50cf20..b609c3509 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/settings/tags/RelayTag.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip17Dm/settings/tags/RelayTag.kt @@ -34,7 +34,7 @@ class RelayTag { fun match(tag: Array) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty() @JvmStatic - fun notMatch(tag: Array) = tag.has(0) && tag[0] == TAG_NAME + fun notMatch(tag: Array) = !(tag.has(0) && tag[0] == TAG_NAME) @JvmStatic fun parse(tag: Array): NormalizedRelayUrl? { diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip42RelayAuth/tags/RelayTag.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip42RelayAuth/tags/RelayTag.kt index bce30729f..498d2b19a 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip42RelayAuth/tags/RelayTag.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip42RelayAuth/tags/RelayTag.kt @@ -33,7 +33,7 @@ class RelayTag { fun match(tag: Array) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty() @JvmStatic - fun notMatch(tag: Array) = tag.has(0) && tag[0] == TAG_NAME + fun notMatch(tag: Array) = !(tag.has(0) && tag[0] == TAG_NAME) @JvmStatic fun parse(tag: Array): NormalizedRelayUrl? { diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/relayLists/tags/RelayTag.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/relayLists/tags/RelayTag.kt index b7c7261cb..bc24afe51 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/relayLists/tags/RelayTag.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/relayLists/tags/RelayTag.kt @@ -33,7 +33,7 @@ class RelayTag { fun match(tag: Array) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty() @JvmStatic - fun notMatch(tag: Array) = tag.has(0) && tag[0] == TAG_NAME + fun notMatch(tag: Array) = !(tag.has(0) && tag[0] == TAG_NAME) @JvmStatic fun parse(tag: Array): NormalizedRelayUrl? { diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/tags/RelayTag.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/tags/RelayTag.kt index 50b700f64..d56776690 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/tags/RelayTag.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip51Lists/tags/RelayTag.kt @@ -33,7 +33,7 @@ class RelayTag { fun match(tag: Array) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty() @JvmStatic - fun notMatch(tag: Array) = tag.has(0) && tag[0] == TAG_NAME + fun notMatch(tag: Array) = !(tag.has(0) && tag[0] == TAG_NAME) @JvmStatic fun parse(tag: Array): NormalizedRelayUrl? { diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip62RequestToVanish/tags/RelayTag.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip62RequestToVanish/tags/RelayTag.kt index 13a1c1eb3..7af462f44 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip62RequestToVanish/tags/RelayTag.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip62RequestToVanish/tags/RelayTag.kt @@ -33,7 +33,7 @@ class RelayTag { fun match(tag: Array) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty() @JvmStatic - fun notMatch(tag: Array) = tag.has(0) && tag[0] == TAG_NAME + fun notMatch(tag: Array) = !(tag.has(0) && tag[0] == TAG_NAME) @JvmStatic fun shouldVanishFrom( diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip65RelayList/tags/AdvertisedRelayInfoTag.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip65RelayList/tags/AdvertisedRelayInfoTag.kt index 20eb69ac4..a588ec4c7 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip65RelayList/tags/AdvertisedRelayInfoTag.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip65RelayList/tags/AdvertisedRelayInfoTag.kt @@ -38,7 +38,7 @@ class AdvertisedRelayInfo( fun match(tag: Array) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty() - fun notMatch(tag: Array) = !match(tag) + fun notMatch(tag: Array) = !(tag.has(0) && tag[0] == TAG_NAME) @JvmStatic fun parse(tag: Array): AdvertisedRelayInfo? {