From b2bd4c1afc157ea422fc790b02e0e3e0c6670881 Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Mon, 4 May 2026 21:58:39 +0200 Subject: [PATCH] Remove neg-close as an incoming message --- .../network/sockets/NostrIncomingMessage.kt | 4 ---- .../network/sockets/NostrIncomingMessageExt.kt | 1 - .../network/sockets/NostrIncomingMessageParser.kt | 15 --------------- .../compose/network/sockets/NostrVerb.kt | 3 --- .../compose/ui/view/model/NavigationViewModel.kt | 5 +---- 5 files changed, 1 insertion(+), 27 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessage.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessage.kt index 83e8d306..c3dd3c9a 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessage.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessage.kt @@ -45,10 +45,6 @@ sealed class NostrIncomingMessage { val negentropyMessage: String, ) : NostrIncomingMessage() - data class NegentropyClose( - val subscriptionId: String - ) : NostrIncomingMessage() - data class NegentropyError( val subscriptionId: String, val negentropyReason: String, diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageExt.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageExt.kt index e512b4f4..40196a9a 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageExt.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageExt.kt @@ -7,7 +7,6 @@ fun Flow.filterBySubscriptionId(id: String) = filter { // Negentropy... (it is NostrIncomingMessage.NegentropyMessage && it.subscriptionId == id) || - (it is NostrIncomingMessage.NegentropyClose && it.subscriptionId == id) || (it is NostrIncomingMessage.NegentropyError && it.subscriptionId == id) || // Events (it is NostrIncomingMessage.EventMessage && it.subscriptionId == id) || diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageParser.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageParser.kt index 92e27c22..b2d64974 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageParser.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrIncomingMessageParser.kt @@ -29,7 +29,6 @@ fun String.parseIncomingMessage(): NostrIncomingMessage? { NostrVerb.Incoming.COUNT -> jsonArray.takeAsCountIncomingMessage() NostrVerb.Incoming.EVENTS -> jsonArray.takeAsEventsIncomingMessage() NostrVerb.Incoming.NEGENTROPY_MESSAGE -> jsonArray.takeAsNegentropyMessageIncomingMessage() - NostrVerb.Incoming.NEGENTROPY_CLOSE -> jsonArray.takeAsNegentropyCloseIncomingMessage() NostrVerb.Incoming.NEGENTROPY_ERROR -> jsonArray.takeAsNegentropyErrorIncomingMessage() null -> null } @@ -157,19 +156,6 @@ private fun JsonArray.takeAsNegentropyMessageIncomingMessage(): NostrIncomingMes } } -private fun JsonArray.takeAsNegentropyCloseIncomingMessage(): NostrIncomingMessage? { - val subscriptionId = elementAtOrNull(1)?.toSubscriptionId() - - return if (subscriptionId != null) { - NostrIncomingMessage.NegentropyClose( - subscriptionId = subscriptionId, - ) - } else { - null - } -} - - private fun JsonArray.takeAsNegentropyErrorIncomingMessage(): NostrIncomingMessage? { val subscriptionId = elementAtOrNull(1)?.toSubscriptionId() val negentropyReason = elementAtOrNull(2)?.jsonPrimitive?.content @@ -194,7 +180,6 @@ private fun JsonElement.toIncomingMessageType(): NostrVerb.Incoming? { "EVENTS" -> NostrVerb.Incoming.EVENTS "NOTICE" -> NostrVerb.Incoming.NOTICE "NEG-MSG" -> NostrVerb.Incoming.NEGENTROPY_MESSAGE - "NEG-CLOSE" -> NostrVerb.Incoming.NEGENTROPY_CLOSE "NEG-ERR" -> NostrVerb.Incoming.NEGENTROPY_ERROR else -> { Logger.d("Unsupported incomingMessageType: ${this.jsonPrimitive.content}") diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrVerb.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrVerb.kt index 7bfa3ab9..78380951 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrVerb.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/network/sockets/NostrVerb.kt @@ -49,9 +49,6 @@ internal sealed class NostrVerb { @SerialName("NEG-MSG") NEGENTROPY_MESSAGE, - @SerialName("NEG-CLOSE") - NEGENTROPY_CLOSE, - @SerialName("NEG-ERR") NEGENTROPY_ERROR, } diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NavigationViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NavigationViewModel.kt index 41e06a4e..914fa296 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NavigationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/NavigationViewModel.kt @@ -220,8 +220,7 @@ class NavigationViewModel( scope.launch(Dispatchers.IO) { nostrRepository.observePendingNegentropySynchronizeRequests().distinctUntilChanged().collect { negentropySynchronizeRequestOrNull -> negentropySynchronizeRequestOrNull?.let { negentropySynchronizeRequest -> - logger.i("synchronizeNostrEventRequest: $negentropySynchronizeRequest") - // TODO: Negentropy... + logger.i("negentropySynchronizeRequest: $negentropySynchronizeRequest") val events = nostrRepository.getNostrFeedIds( arrayOf( @@ -239,7 +238,6 @@ class NavigationViewModel( seal() } - logger.d("Negentropy Storage: $storage") val negentropy = Negentropy( storage, ) @@ -349,7 +347,6 @@ class NavigationViewModel( broadcastNostrEventRequests ) } - else -> { logger.d("Unhandled message ${negentropySynchronizeRequest.relayURL}: $nostrIncomingMessage") }