From ee8e544ff621b2daf473514d90d7bc3005ebd337 Mon Sep 17 00:00:00 2001
From: Kgothatso Ngako <kgothatso@machankura.com>
Date: Mon, 4 May 2026 21:40:19 +0200
Subject: [PATCH] Improve sync logic

---
 .../repository/DatabaseNostrRepository.kt     |  4 +-
 .../compose/repository/NostrRepository.kt     |  3 +
 .../ui/view/model/NavigationViewModel.kt      | 85 +++++++++++--------
 3 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseNostrRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseNostrRepository.kt
index 2d46f392..9bc591e0 100644
--- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseNostrRepository.kt
+++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/repository/DatabaseNostrRepository.kt
@@ -432,7 +432,9 @@ class DatabaseNostrRepository(
         storeNostrEventMutex.withLock {
             logger.d("saveNostrEvent: $nostrEvent")
             database.nostrDao().storeNostrEvent(
-                nostrEvent,
+                nostrEvent.copy(
+                    broadcastedAt = nostrEvent.createdAt
+                ),
                 synchronizationRelayURLs = synchronizationRelayURLs,
                 level = synchronizeNostrEventRequest.level
             )
diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrRepository.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrRepository.kt
index e9f34873..c47c0522 100644
--- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrRepository.kt
+++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/repository/NostrRepository.kt
@@ -75,6 +75,9 @@ interface NostrRepository {
 
     suspend fun saveBroadcastReceipt(broadcastNostrEventReceipt: BroadcastNostrEventReceipt)
 
+    /**
+     * Save nostrEvent from relays (and index for local viewing)...
+     */
     suspend fun saveNostrEvent(
         nostrEvent: NostrEvent,
         synchronizeNostrEventRequest: SynchronizeNostrEventRequest,
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 8be94651..41e06a4e 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
@@ -2,6 +2,7 @@ package ac.cord.auxiliary.compose.ui.view.model
 
 import ac.cord.auxiliary.compose.database.model.BroadcastNostrEventRequest
 import ac.cord.auxiliary.compose.database.model.NostrEvent
+import ac.cord.auxiliary.compose.database.model.SynchronizeNostrEventRequest
 import ac.cord.auxiliary.compose.managers.SeedManager
 import ac.cord.auxiliary.compose.network.dto.RelayDTO
 import ac.cord.auxiliary.compose.network.relays.RelayPool.Companion.PUBLISH_TIMEOUT
@@ -40,6 +41,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.getAndUpdate
 import kotlinx.coroutines.flow.timeout
 import kotlinx.coroutines.launch
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Instant
 
@@ -303,19 +305,28 @@ class NavigationViewModel(
                                         )
                                     }
                                     is NostrIncomingMessage.NegentropyError -> {
-                                        // TODO: Handle negentropy error...
-//                                        nostrRepository.queueSynchronizeNostrEvent(
-//                                            Relays.eventPublishRelaySet.take(1).map { normalizedRelay -> // TODO: Sync from all the publish relays...
-//                                                SynchronizeNostrEventRequest(
-//                                                    purpose = "feed",
-//                                                    synchronizationFilters = arrayOf(
-//                                                        synchronizationFilter
-//                                                    ),
-//                                                    relayURL = normalizedRelay.url,
-//                                                    level = 0,
-//                                                )
-//                                            }
-//                                        )
+                                        logger.d("Negentropy Erroy (need to synchronize like normal): ${nostrIncomingMessage.negentropyReason}")
+
+                                        val since = negentropySynchronizeRequest.synchronizationFilter.since // TODO: Update since -> until based on what we have in the local db...
+                                        val until = negentropySynchronizeRequest.synchronizationFilter.until
+
+                                        val synchronizationFilter = negentropySynchronizeRequest.synchronizationFilter.copy(
+                                            since = since,
+                                            until = until
+                                        )
+
+                                        nostrRepository.queueSynchronizeNostrEvent(
+                                            listOf(
+                                                SynchronizeNostrEventRequest(
+                                                    purpose = negentropySynchronizeRequest.purpose,
+                                                    synchronizationFilters = arrayOf(
+                                                        synchronizationFilter
+                                                    ),
+                                                    relayURL = negentropySynchronizeRequest.relayURL,
+                                                    level = negentropySynchronizeRequest.level,
+                                                )
+                                            )
+                                        )
                                     }
                                     is NostrIncomingMessage.NegentropyMessage -> {
                                         logger.d("NegentropyMessage: ${nostrIncomingMessage.negentropyMessage}")
@@ -326,6 +337,7 @@ class NavigationViewModel(
                                         logger.d("NeedIds: ${result.needIds.map { it.toHexString() }}")
                                         logger.d("SendIds: ${result.sendIds.map { it.toHexString() }}")
                                         logger.d("EventsIds: ${events.map { it.id }}")
+                                        logger.d("Timestamp: ${events.map { it.createdAt.epochSeconds }}")
 
                                         val broadcastNostrEventRequests = result.sendIds.map { nostrEventId ->
                                             BroadcastNostrEventRequest(
@@ -365,30 +377,29 @@ class NavigationViewModel(
                         localBroadcastNostrEventRequest.broadcastNostrEventRequest
                     )
 
-                    if (localBroadcastNostrEventRequest.nostrEvent.broadcastedAt == null) {
-                        scope.launch(Dispatchers.IO) {
-                            relaysSocketManager.publishEvent(
-                                localBroadcastNostrEventRequest.nostrEvent
-                            ).timeout(PUBLISH_TIMEOUT.milliseconds).catch {
-                                // Timeout...
-                            }.collect { nostrPublishResult ->
-                                if (nostrPublishResult.error != null) {
-                                    logger.e("Error publishing note: $nostrPublishResult")
-                                    nostrRepository.broadcastProcessed(
-                                        localBroadcastNostrEventRequest.broadcastNostrEventRequest,
-                                        "failed"
-                                    )
-                                } else {
-                                    logger.d("Nostr Publish Result: $nostrPublishResult")
-                                    nostrRepository.broadcastProcessed(
-                                        localBroadcastNostrEventRequest.broadcastNostrEventRequest,
-                                        "published"
-                                    )
-                                }
-                            }
-                        }
-
-                    }
+//                    if (localBroadcastNostrEventRequest.nostrEvent.broadcastedAt == null) {
+//                        scope.launch(Dispatchers.IO) {
+//                            relaysSocketManager.publishEvent(
+//                                localBroadcastNostrEventRequest.nostrEvent
+//                            ).timeout(PUBLISH_TIMEOUT.milliseconds).catch {
+//                                // Timeout...
+//                            }.collect { nostrPublishResult ->
+//                                if (nostrPublishResult.error != null) {
+//                                    logger.e("Error publishing note: $nostrPublishResult")
+//                                    nostrRepository.broadcastProcessed(
+//                                        localBroadcastNostrEventRequest.broadcastNostrEventRequest,
+//                                        "failed"
+//                                    )
+//                                } else {
+//                                    logger.d("Nostr Publish Result: $nostrPublishResult")
+//                                    nostrRepository.broadcastProcessed(
+//                                        localBroadcastNostrEventRequest.broadcastNostrEventRequest,
+//                                        "published"
+//                                    )
+//                                }
+//                            }
+//                        }
+//                    }
 
                     scope.launch(Dispatchers.IO) {
                         // Broadcast to the intended relay...