mantra/mantra-kmp
1
0
Fork 0
Code Issues 2 Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Refactor syncing

Browse Source
This commit is contained in:
Kgothatso Ngako
2026-06-04 14:15:29 +02:00
parent d39b567748
commit 0d4b517506
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/NegentropySynchronizeRequest.kt
View File

@@ -50,6 +50,24 @@ data class NegentropySynchronizeRequest(
override val updatedAt: Instant = createdAt,
): OptionalNostrEventEntity, TimestampedEntity {
fun toSynchronizeNostrEventRequest(): SynchronizeNostrEventRequest {
val since = synchronizationFilter.since // TODO: Update since -> until based on what we have in the local db...
val until = synchronizationFilter.until
val synchronizationFilter = synchronizationFilter.copy(
since = since,
until = until
)
return SynchronizeNostrEventRequest(
purpose = purpose,
synchronizationFilters = arrayOf(
synchronizationFilter
),
relayURL = relayURL,
level = level,
)
}
companion object {
fun computeId(
relayURL: String,

1
composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/ChatRoomDetailMessageListViewModel.kt
View File

@@ -120,6 +120,7 @@ class ChatRoomDetailMessageListViewModel(
} else {
isReceiverChatMessageRelayListMissing.value = true
// TODO: compute the timestamp for when list we sent messages and use that as since...
Pair(
Relays.negentropicRelaySet,
SynchronizationFilter(

27
composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/SynchronizationViewModel.kt
View File

@@ -258,24 +258,9 @@ class SynchronizationViewModel(
logger.d("Negentropy Error (need to synchronize like normal): ${nostrIncomingMessage.negentropyReason}")
// TODO: Don't schedule a sync when on mobile internet.
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,
)
negentropySynchronizeRequest.toSynchronizeNostrEventRequest()
)
)
return@collect
@@ -328,6 +313,16 @@ class SynchronizationViewModel(
return@collect
}
is NostrIncomingMessage.NoticeMessage -> {
logger.d("Notice message ${negentropySynchronizeRequest.relayURL}: $nostrIncomingMessage")
if (nostrIncomingMessage.subscriptionId?.contains("negentropy disabled") == true) {
nostrRepository.queueSynchronizeNostrEvent(
listOf(
negentropySynchronizeRequest.toSynchronizeNostrEventRequest()
)
)
}
}
else -> {
logger.d("Unhandled message ${negentropySynchronizeRequest.relayURL}: $nostrIncomingMessage")
}