diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt index 1b04d958a..ad83690e9 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt @@ -27,6 +27,8 @@ class LnZapEvent( .filter { it.firstOrNull() == "p" } .mapNotNull { it.getOrNull(1) } + override fun zappedRequestAuthor(): String? = containedPost()?.pubKey() + override fun amount(): BigDecimal? { return amount } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEventInterface.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEventInterface.kt index c31d9658a..b69e02781 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEventInterface.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEventInterface.kt @@ -10,6 +10,8 @@ interface LnZapEventInterface : EventInterface { fun zappedAuthor(): List + fun zappedRequestAuthor(): String? + fun taggedAddresses(): List fun amount(): BigDecimal? diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt index c967261c0..87cbe6fa0 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt @@ -94,7 +94,7 @@ class PollNoteViewModel { .filterIsInstance() .map { val zappedOption = it.zappedPollOption() - if (zappedOption == option) { + if (zappedOption == option && it.zappedRequestAuthor() == user.pubkeyHex ) { return true } }