- Updates several libraries
- Reformats code to the newest Klint - Fixes isEmpty bug on Filters
This commit is contained in:
+12
-6
@@ -51,38 +51,44 @@ class MessageDeserializer : StdDeserializer<Message>(Message::class.java) {
|
||||
)
|
||||
}
|
||||
|
||||
EoseMessage.LABEL ->
|
||||
EoseMessage.LABEL -> {
|
||||
EoseMessage(
|
||||
subId = jp.nextTextValue(),
|
||||
)
|
||||
}
|
||||
|
||||
NoticeMessage.LABEL ->
|
||||
NoticeMessage.LABEL -> {
|
||||
NoticeMessage(
|
||||
message = jp.nextTextValue(),
|
||||
)
|
||||
}
|
||||
|
||||
OkMessage.LABEL ->
|
||||
OkMessage.LABEL -> {
|
||||
OkMessage(
|
||||
eventId = jp.nextTextValue(),
|
||||
success = jp.nextBooleanValue(),
|
||||
message = jp.nextTextValue() ?: "",
|
||||
)
|
||||
}
|
||||
|
||||
AuthMessage.LABEL ->
|
||||
AuthMessage.LABEL -> {
|
||||
AuthMessage(
|
||||
challenge = jp.nextTextValue(),
|
||||
)
|
||||
}
|
||||
|
||||
NotifyMessage.LABEL ->
|
||||
NotifyMessage.LABEL -> {
|
||||
NotifyMessage(
|
||||
message = jp.nextTextValue(),
|
||||
)
|
||||
}
|
||||
|
||||
ClosedMessage.LABEL ->
|
||||
ClosedMessage.LABEL -> {
|
||||
ClosedMessage(
|
||||
subId = jp.nextTextValue(),
|
||||
message = jp.nextTextValue() ?: "",
|
||||
)
|
||||
}
|
||||
|
||||
CountMessage.LABEL -> {
|
||||
val queryId = jp.nextTextValue()
|
||||
|
||||
+3
-1
@@ -72,7 +72,9 @@ class MessageSerializer : StdSerializer<Message>(Message::class.java) {
|
||||
countSerializer.serialize(msg.result, gen, provider)
|
||||
}
|
||||
|
||||
else -> null
|
||||
else -> {
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
gen.writeEndArray()
|
||||
|
||||
+2
-1
@@ -84,10 +84,11 @@ class CommandDeserializer : StdDeserializer<Command>(Command::class.java) {
|
||||
)
|
||||
}
|
||||
|
||||
CloseCmd.LABEL ->
|
||||
CloseCmd.LABEL -> {
|
||||
CloseCmd(
|
||||
subId = jp.nextTextValue(),
|
||||
)
|
||||
}
|
||||
|
||||
AuthCmd.LABEL -> {
|
||||
jp.nextToken()
|
||||
|
||||
+3
-1
@@ -65,7 +65,9 @@ class CommandSerializer : StdSerializer<Command>(Command::class.java) {
|
||||
}
|
||||
}
|
||||
|
||||
else -> null
|
||||
else -> {
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
gen.writeEndArray()
|
||||
|
||||
-2
@@ -50,12 +50,10 @@ class BunkerRequestDeserializer : StdDeserializer<BunkerRequest>(BunkerRequest::
|
||||
BunkerRequestConnect.METHOD_NAME -> BunkerRequestConnect.parse(id, params)
|
||||
BunkerRequestGetPublicKey.METHOD_NAME -> BunkerRequestGetPublicKey.parse(id, params)
|
||||
BunkerRequestGetRelays.METHOD_NAME -> BunkerRequestGetRelays.parse(id, params)
|
||||
|
||||
BunkerRequestNip04Decrypt.METHOD_NAME -> BunkerRequestNip04Decrypt.parse(id, params)
|
||||
BunkerRequestNip04Encrypt.METHOD_NAME -> BunkerRequestNip04Encrypt.parse(id, params)
|
||||
BunkerRequestNip44Decrypt.METHOD_NAME -> BunkerRequestNip44Decrypt.parse(id, params)
|
||||
BunkerRequestNip44Encrypt.METHOD_NAME -> BunkerRequestNip44Encrypt.parse(id, params)
|
||||
|
||||
BunkerRequestPing.METHOD_NAME -> BunkerRequestPing.parse(id, params)
|
||||
BunkerRequestSign.METHOD_NAME -> BunkerRequestSign.parse(id, params)
|
||||
else -> BunkerRequest(id, method, params)
|
||||
|
||||
+8
-2
@@ -50,8 +50,14 @@ class BunkerResponseDeserializer : StdDeserializer<BunkerResponse>(BunkerRespons
|
||||
|
||||
if (result != null) {
|
||||
when (result) {
|
||||
BunkerResponseAck.RESULT -> return BunkerResponseAck.parse(id, result, error)
|
||||
BunkerResponsePong.RESULT -> return BunkerResponsePong.parse(id, result, error)
|
||||
BunkerResponseAck.RESULT -> {
|
||||
return BunkerResponseAck.parse(id, result, error)
|
||||
}
|
||||
|
||||
BunkerResponsePong.RESULT -> {
|
||||
return BunkerResponsePong.parse(id, result, error)
|
||||
}
|
||||
|
||||
else -> {
|
||||
if (result.length == 64 && Hex.isHex(result)) {
|
||||
return BunkerResponsePublicKey.parse(id, result)
|
||||
|
||||
Reference in New Issue
Block a user