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

Sync groups.

Browse Source
This commit is contained in:
Kgothatso Ngako
2026-07-02 12:59:22 +02:00
parent c443444d5e
commit bd457ff60b
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/NostrDao.kt
View File

@@ -14,6 +14,7 @@ import at.torch.compose.database.model.NostrEventRelay
import at.torch.compose.database.model.Participant
import at.torch.compose.database.model.Post
import at.torch.compose.database.model.Profile
import at.torch.compose.database.model.SynchronizeNostrEventRequest
import at.torch.compose.database.model.types.SynchronizationFilter
import at.torch.compose.exceptions.GiftWrapImpersonationException
import at.torch.compose.exceptions.GiftWrapSealDecryptionException
@@ -129,7 +130,7 @@ abstract class NostrDao(
// Setup the sync here...
} else {
// TODO: Check if event got indexed...
// return
return
}
}
@@ -623,7 +624,8 @@ abstract class NostrDao(
)
if (localChatRoom == null) {
logger.d("processWelcome: welcomeBytes=${welcomeBytes.size}B looking up KeyPackage by ref=${keyPackageEventId.take(8)}…")
logger.d("processWelcome: welcomeBytes=${welcomeBytes.size}B")
logger.d("Marmot Data: ${group.currentMarmotData()}")
// TODO: Save the chat room We can now s
@@ -632,10 +634,10 @@ abstract class NostrDao(
ChatRoom(
id = nostrGroupId,
userPublicKey = userPublicKey,
subject = group.currentMarmotData()?.name,
subject = group.currentMarmotData()?.name?.ifBlank { null },
initialGiftWrapPayloadId = decryptedGiftWrapPayload.id,
createdAt = decryptedGiftWrapPayload.createdAt,
mlsGroupState = group.saveState().encodeTls().toHex()
mlsGroupState = group.saveState().encodeTls().toHex(),
)
)
@@ -646,25 +648,29 @@ abstract class NostrDao(
)
// TODO: Add participants... by processing group.members()
val normalizedRelayUrl = NormalizedRelayUrl(relayURL)
val participants = group.members().mapNotNull { (leafIndex, leafNode) ->
val pubkey =
when (val cred = leafNode.credential) {
is Credential.Basic -> cred.identity.toHexKey()
else -> null
}
logger.d("Pubkey: $pubkey")
if (pubkey != null) {
Participant(
participantPublicKey = pubkey,
chatRoomId = nostrGroupId,
relayHint = normalizedRelayUrl.url
relayHint = group.currentMarmotData()?.relays?.firstOrNull() ?: normalizedRelayUrl.url
)
} else {
null
}
}
logger.d("Participants: $participants")
// Sync missing participant profiles...
participants.forEach { participant ->
val giftWrapParticipantProfile = database.profileDao().getProfileByPublicKey(participant.participantPublicKey)
@@ -702,6 +708,7 @@ abstract class NostrDao(
participants
)
// Save ChatRoom Relays...
participants.filter { it.participantPublicKey != userPublicKey }.forEach { participant ->
val publicKey = participant.participantPublicKey
@@ -769,22 +776,22 @@ abstract class NostrDao(
profilePublicKeysToSync[relayURL]?.add(participant.participantPublicKey)
}
}
// Where is the decoded welcome message...
// TODO: Sync GroupEvents/Messages...
// database.chatMessageDao().upsert(
// ChatMessage(
// giftWrapPayloadId = decryptedGiftWrapPayload.id,
// senderPublicKey = decryptedGiftWrapPayload.publicKey,
// isUserMessage = activeKeyPair.pubKey.toHex() == decryptedGiftWrapPayload.publicKey,
// chatRoomId = nostrGroupId,
// createdAt = decryptedGiftWrapPayload.createdAt,
// content = "Coming soon.", // TODO: Figure out what to do here...
// )
// )
} else {
logger.w("Chat Room already exists for $nostrGroupId")
}
// Where is the decoded welcome message...
// TODO: Sync GroupEvents/Messages...
database.chatMessageDao().upsert(
ChatMessage(
giftWrapPayloadId = decryptedGiftWrapPayload.id,
senderPublicKey = decryptedGiftWrapPayload.publicKey,
isUserMessage = activeKeyPair.pubKey.toHex() == decryptedGiftWrapPayload.publicKey,
chatRoomId = nostrGroupId,
createdAt = decryptedGiftWrapPayload.createdAt,
content = "Coming soon.", // TODO: Figure out what to do here...
)
)
// TODO: Check encoding...
} else {
logger.w("Unsupported event: $decryptedGiftWrapPayload")

1
composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/NavigationViewModel.kt
View File

@@ -162,6 +162,7 @@ class NavigationViewModel(
activeWalletStateFlow.collectLatest { activeWallet ->
logger.d("Active Wallet: $activeWallet")
if (activeWallet == null) {
_navigationUIState.getAndUpdate {
NavigationUIState.StartupPhoenix
}