From 149f704d1c8a1c98f3637f2016da2d48fb6de5ec Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Wed, 22 Apr 2026 03:29:39 +0200 Subject: [PATCH] Bug fix on profile placeholder handling --- .../kotlin/ac/cord/auxiliary/compose/database/dao/NostrDao.kt | 2 +- .../kotlin/ac/cord/auxiliary/compose/database/dao/ProfileDao.kt | 1 + .../commonMain/kotlin/ac/cord/auxiliary/compose/nostr/Relays.kt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrDao.kt index 9ec1a2fa..10ae1a4c 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/NostrDao.kt @@ -379,7 +379,7 @@ abstract class NostrDao( if (profile == null) { val placeHolderProfile = Profile( - publicKey = nostrEvent.pubKey, + publicKey = followedHexKEys, createdAt = GENESIS_AT, nostrEventId = nostrEvent.id, // Will get overwriting by sync, ) diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ProfileDao.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ProfileDao.kt index 89e9fecd..be49be4d 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ProfileDao.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/dao/ProfileDao.kt @@ -6,6 +6,7 @@ import ac.cord.auxiliary.compose.database.model.intermdiate.LocalProfileWithFoll import ac.cord.auxiliary.compose.database.model.intermdiate.LocalProfileWithFollowing import androidx.room.Dao import androidx.room.Insert +import androidx.room.OnConflictStrategy.Companion.IGNORE import androidx.room.Query import androidx.room.Upsert diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/nostr/Relays.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/nostr/Relays.kt index fa83fe71..c4b3b5c2 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/nostr/Relays.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/nostr/Relays.kt @@ -34,7 +34,7 @@ object Relays { val nostr1 = RelayUrlNormalizer.normalize("wss://profiles.nostr1.com") val bootstrapInboxRelaySet = setOf(damus, primal, mom, nos, bitcoiner, oxtr, yabu) - val eventFinderRelaySet = setOf(primal, wine, damus, mom, nos, bitcoiner, oxtr) + val eventFinderRelaySet = setOf(wine, damus, mom, primal, nos, bitcoiner, oxtr) val eventPublishRelaySet = setOf(primal, mom, nos, bitcoiner, oxtr)