laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-10 00:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3065 from vitorpamplona/claude/gifted-ritchie-5XjZf

Browse Source 
Exclude author from zap split display logic
This commit is contained in:
Vitor Pamplona
2026-05-27 11:09:29 -04:00
committed by GitHub
parent 7d6bbac200 e876e2b09b
commit bbc7f9740e
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+4 -4
View File
@@ -275,7 +275,7 @@ import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEven
import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
import com.vitorpamplona.quartz.nip56Reports.ReportEvent
import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
import com.vitorpamplona.quartz.nip57Zaps.splits.hasZapSplitSetup
import com.vitorpamplona.quartz.nip57Zaps.splits.hasZapSplitSetupBesidesAuthor
import com.vitorpamplona.quartz.nip58Badges.award.BadgeAwardEvent
import com.vitorpamplona.quartz.nip58Badges.definition.BadgeDefinitionEvent
import com.vitorpamplona.quartz.nip5aStaticWebsites.NamedSiteEvent
@@ -727,7 +727,7 @@ fun InnerNoteWithReactions(
if (!makeItShort) {
val noteEvent = baseNote.event
val zapSplits = remember(noteEvent) { noteEvent?.hasZapSplitSetup() ?: false }
val zapSplits = remember(noteEvent) { noteEvent?.hasZapSplitSetupBesidesAuthor() ?: false }
if (zapSplits && noteEvent != null) {
Spacer(modifier = HalfDoubleVertSpacer)
DisplayZapSplits(noteEvent, false, accountViewModel, nav)
@@ -851,7 +851,7 @@ fun NoteBody(
if (!makeItShort) {
val noteEvent = baseNote.event
val zapSplits = remember(noteEvent) { noteEvent?.hasZapSplitSetup() ?: false }
val zapSplits = remember(noteEvent) { noteEvent?.hasZapSplitSetupBesidesAuthor() ?: false }
if (zapSplits && noteEvent != null) {
Spacer(modifier = HalfDoubleVertSpacer)
DisplayZapSplits(noteEvent, false, accountViewModel, nav)
@@ -1502,7 +1502,7 @@ fun RenderDraft(
nav = nav,
)
val zapSplits = remember(it.event) { it.event?.hasZapSplitSetup() }
val zapSplits = remember(it.event) { it.event?.hasZapSplitSetupBesidesAuthor() }
if (zapSplits == true) {
Spacer(modifier = HalfDoubleVertSpacer)
DisplayZapSplits(it.event!!, false, accountViewModel, nav)
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip57Zaps/splits/EventExt.kt
+10
View File
@@ -25,3 +25,13 @@ import com.vitorpamplona.quartz.nip01Core.core.Event
fun Event.hasZapSplitSetup() = tags.hasZapSplitSetup()
fun Event.zapSplitSetup(): List<BaseZapSplitSetup> = tags.zapSplitSetup()
fun Event.hasZapSplitSetupBesidesAuthor(): Boolean {
val list = zapSplitSetup()
if (list.isEmpty()) return false
if (list.size == 1) {
val only = list.first()
if (only is ZapSplitSetup && only.pubKeyHex == pubKey) return false
}
return true
}