Fixes unable to delete relays from some lists.
This commit is contained in:
+2
-5
@@ -68,11 +68,8 @@ class ChatMessageRelayListEvent(
|
|||||||
val tags =
|
val tags =
|
||||||
earlierVersion.tags
|
earlierVersion.tags
|
||||||
.filter(RelayTag::notMatch)
|
.filter(RelayTag::notMatch)
|
||||||
.plus(
|
.plus(relays.map { RelayTag.assemble(it) })
|
||||||
relays.map {
|
.toTypedArray()
|
||||||
RelayTag.assemble(it)
|
|
||||||
},
|
|
||||||
).toTypedArray()
|
|
||||||
|
|
||||||
return signer.sign(createdAt, KIND, tags, earlierVersion.content)
|
return signer.sign(createdAt, KIND, tags, earlierVersion.content)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class RelayTag {
|
|||||||
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun notMatch(tag: Array<String>) = tag.has(0) && tag[0] == TAG_NAME
|
fun notMatch(tag: Array<String>) = !(tag.has(0) && tag[0] == TAG_NAME)
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun parse(tag: Array<String>): NormalizedRelayUrl? {
|
fun parse(tag: Array<String>): NormalizedRelayUrl? {
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class RelayTag {
|
|||||||
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun notMatch(tag: Array<String>) = tag.has(0) && tag[0] == TAG_NAME
|
fun notMatch(tag: Array<String>) = !(tag.has(0) && tag[0] == TAG_NAME)
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun parse(tag: Array<String>): NormalizedRelayUrl? {
|
fun parse(tag: Array<String>): NormalizedRelayUrl? {
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ class RelayTag {
|
|||||||
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun notMatch(tag: Array<String>) = tag.has(0) && tag[0] == TAG_NAME
|
fun notMatch(tag: Array<String>) = !(tag.has(0) && tag[0] == TAG_NAME)
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun parse(tag: Array<String>): NormalizedRelayUrl? {
|
fun parse(tag: Array<String>): NormalizedRelayUrl? {
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class RelayTag {
|
|||||||
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun notMatch(tag: Array<String>) = tag.has(0) && tag[0] == TAG_NAME
|
fun notMatch(tag: Array<String>) = !(tag.has(0) && tag[0] == TAG_NAME)
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun parse(tag: Array<String>): NormalizedRelayUrl? {
|
fun parse(tag: Array<String>): NormalizedRelayUrl? {
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class RelayTag {
|
|||||||
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun notMatch(tag: Array<String>) = tag.has(0) && tag[0] == TAG_NAME
|
fun notMatch(tag: Array<String>) = !(tag.has(0) && tag[0] == TAG_NAME)
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun shouldVanishFrom(
|
fun shouldVanishFrom(
|
||||||
|
|||||||
+1
-1
@@ -38,7 +38,7 @@ class AdvertisedRelayInfo(
|
|||||||
|
|
||||||
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
fun match(tag: Array<String>) = tag.has(1) && tag[0] == TAG_NAME && tag[1].isNotEmpty()
|
||||||
|
|
||||||
fun notMatch(tag: Array<String>) = !match(tag)
|
fun notMatch(tag: Array<String>) = !(tag.has(0) && tag[0] == TAG_NAME)
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun parse(tag: Array<String>): AdvertisedRelayInfo? {
|
fun parse(tag: Array<String>): AdvertisedRelayInfo? {
|
||||||
|
|||||||
Reference in New Issue
Block a user