From 755e91bbd59940c0814aecf9d828376a27128720 Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Fri, 1 May 2026 19:28:03 +0200 Subject: [PATCH] Add mentioned profiles on quoted/reposted/inreply to --- .../model/intermdiate/LocalInReplyToNostrEvent.kt | 14 +++++++------- .../model/intermdiate/LocalQuotedNostrEvent.kt | 13 +++++++------ .../model/intermdiate/LocalRepostedNostrEvent.kt | 13 +++++++------ .../ui/composable/widgets/content/QuotedNote.kt | 2 -- .../ui/composable/widgets/feed/EventListView.kt | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt index a10d41f0..54096520 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalInReplyToNostrEvent.kt @@ -1,6 +1,7 @@ package ac.cord.auxiliary.compose.database.model.intermdiate import ac.cord.auxiliary.compose.database.model.InReplyToRelation +import ac.cord.auxiliary.compose.database.model.Mention import ac.cord.auxiliary.compose.database.model.NostrEvent import ac.cord.auxiliary.compose.database.model.Profile import ac.cord.auxiliary.compose.database.model.QuotedRelation @@ -37,13 +38,12 @@ data class LocalInReplyToNostrEvent( ) val profile: Profile?, - // TODO: Figure out if we want to add the root of the reply... -// @Relation( -// entity = Mention::class, -// parentColumn = "id", -// entityColumn = "nostrEventId", -// ) -// val mentionedProfiles: List = emptyList(), + @Relation( + entity = Mention::class, + parentColumn = "inReplyToNostrEventId", + entityColumn = "nostrEventId", + ) + val mentionedProfiles: List = emptyList(), ) { @Composable fun RenderNotePreview() { diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt index 4d7b8d83..f1b19254 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalQuotedNostrEvent.kt @@ -1,5 +1,6 @@ package ac.cord.auxiliary.compose.database.model.intermdiate +import ac.cord.auxiliary.compose.database.model.Mention import ac.cord.auxiliary.compose.database.model.NostrEvent import ac.cord.auxiliary.compose.database.model.Profile import ac.cord.auxiliary.compose.database.model.QuotedRelation @@ -36,12 +37,12 @@ data class LocalQuotedNostrEvent( ) val profile: Profile?, -// @Relation( -// entity = Mention::class, -// parentColumn = "id", -// entityColumn = "nostrEventId", -// ) -// val mentionedProfiles: List = emptyList(), + @Relation( + entity = Mention::class, + parentColumn = "quotedNostrEventId", + entityColumn = "nostrEventId", + ) + val mentionedProfiles: List = emptyList(), ) { @Composable fun RenderNotePreview() { diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt index e7355e42..2e7f9327 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/database/model/intermdiate/LocalRepostedNostrEvent.kt @@ -1,5 +1,6 @@ package ac.cord.auxiliary.compose.database.model.intermdiate +import ac.cord.auxiliary.compose.database.model.Mention import ac.cord.auxiliary.compose.database.model.NostrEvent import ac.cord.auxiliary.compose.database.model.Profile import ac.cord.auxiliary.compose.database.model.QuotedRelation @@ -37,12 +38,12 @@ data class LocalRepostedNostrEvent( ) val profile: Profile?, -// @Relation( -// entity = Mention::class, -// parentColumn = "id", -// entityColumn = "nostrEventId", -// ) -// val mentionedProfiles: List = emptyList(), + @Relation( + entity = Mention::class, + parentColumn = "repostedNostrEventId", + entityColumn = "nostrEventId", + ) + val mentionedProfiles: List = emptyList(), ) { @Composable fun RenderNotePreview() { diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/content/QuotedNote.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/content/QuotedNote.kt index 2a6aabd6..f8d11d26 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/content/QuotedNote.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/content/QuotedNote.kt @@ -24,8 +24,6 @@ import androidx.compose.ui.unit.dp @Composable fun QuotedNote( localQuotedNostrEvent: LocalQuotedNostrEvent? = null, - quotedProfile: Profile? = null, - relayHints: List = emptyList(), onNoteClick: ((String) -> Unit)? = null, noteActions: NoteActions? = null ) { diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/EventListView.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/EventListView.kt index 96aae26a..21358061 100644 --- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/EventListView.kt +++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/widgets/feed/EventListView.kt @@ -68,7 +68,7 @@ fun LocalNostrEvent.ListView( profile = localRepostedNostrEvent.profile, localQuotedNostrEvent = null, localInReplyToNostrEvent = null, - mentionedProfiles = emptyList(), // TODO: Add localReposted.mentionedProfiles... + mentionedProfiles = localRepostedNostrEvent.mentionedProfiles, onNavigateToEvent = onNavigateToEvent ) } else {