nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Turns the Zap notification card in to ZapRequest/ZapEvent events.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-02-21 11:33:03 -05:00
parent a34cf117a0
commit 18f25aa4d8
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapSetCompose.kt
+1 -1
View File
@@ -102,7 +102,7 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInner
FlowRow() { FlowRow() {
zapSetCard.zapEvents.forEach { zapSetCard.zapEvents.forEach {
NoteAuthorPicture( NoteAuthorPicture(
note = it, note = it.key,
navController = navController, navController = navController,
userAccount = account.userProfile(), userAccount = account.userProfile(),
size = 35.dp size = 35.dp
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedState.kt
+2 -2
View File
@@ -24,8 +24,8 @@ class LikeSetCard(val note: Note, val likeEvents: List<Note>): Card() {
override fun id() = note.idHex + "L" + createdAt override fun id() = note.idHex + "L" + createdAt
} }
class ZapSetCard(val note: Note, val zapEvents: List<Note>): Card() { class ZapSetCard(val note: Note, val zapEvents: Map<Note, Note>): Card() {
val createdAt = zapEvents.maxOf { it.event?.createdAt ?: 0 } val createdAt = zapEvents.maxOf { it.value.event?.createdAt ?: 0 }
override fun createdAt(): Long { override fun createdAt(): Long {
return createdAt return createdAt
} }
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
+4 -4
View File
@@ -71,15 +71,15 @@ open class CardFeedViewModel(val dataSource: FeedFilter<Note>): ViewModel() {
val reactionCards = reactionsPerEvent.map { LikeSetCard(it.key, it.value) } val reactionCards = reactionsPerEvent.map { LikeSetCard(it.key, it.value) }
val zapsPerEvent = mutableMapOf<Note, MutableList<Note>>() val zapsPerEvent = mutableMapOf<Note, MutableMap<Note, Note>>()
notes notes
.filter { it.event is LnZapEvent} .filter { it.event is LnZapEvent}
.forEach { zapEvent -> .forEach { zapEvent ->
val zappedPost = zapEvent.replyTo?.lastOrNull() { it.event !is ChannelMetadataEvent && it.event !is ChannelCreateEvent } val zappedPost = zapEvent.replyTo?.lastOrNull() { it.event !is ChannelMetadataEvent && it.event !is ChannelCreateEvent }
if (zappedPost != null) { if (zappedPost != null) {
val key = zappedPost.zaps.filter { it.value == zapEvent }.keys.firstOrNull() val zapRequest = zappedPost.zaps.filter { it.value == zapEvent }.keys.firstOrNull()
if (key != null) { if (zapRequest != null) {
zapsPerEvent.getOrPut(zappedPost, { mutableListOf() }).add(key) zapsPerEvent.getOrPut(zappedPost, { mutableMapOf() }).put(zapRequest, zapEvent)
} }
} }
} }