diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt index 614ec3c50..0759db8ed 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -326,7 +326,8 @@ object LocalCache { // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}") - val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateNote(it) } + val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) } + .mapNotNull { checkGetOrCreateNote(it) } note.loadEvent(event, author, repliesTo) @@ -347,7 +348,8 @@ object LocalCache { deleteNote.author?.removeNote(deleteNote) // reverts the add - val mentions = deleteNote.event?.tags()?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }?.mapNotNull { checkGetOrCreateUser(it) } + val mentions = deleteNote.event?.tags()?.filter { it.firstOrNull() == "p" } + ?.mapNotNull { it.getOrNull(1) }?.mapNotNull { checkGetOrCreateUser(it) } mentions?.forEach { user -> user.removeReport(deleteNote) @@ -571,7 +573,10 @@ object LocalCache { val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) } val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } + event.taggedAddresses().map { getOrCreateAddressableNote(it) } + - ((zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet()) + ( + (zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses() + ?.map { getOrCreateAddressableNote(it) } ?: emptySet() + ) note.loadEvent(event, author, repliesTo) @@ -662,7 +667,9 @@ object LocalCache { // Doesn't need to clean up the replies and mentions.. Too small to matter. // reverts the add - val mentions = it.event?.tags()?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }?.mapNotNull { checkGetOrCreateUser(it) } + val mentions = + it.event?.tags()?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) } + ?.mapNotNull { checkGetOrCreateUser(it) } // Counts the replies it.replyTo?.forEach { replyingNote -> @@ -709,7 +716,8 @@ object LocalCache { } } -class LocalCacheLiveData(val cache: LocalCache) : LiveData(LocalCacheState(cache)) { +class LocalCacheLiveData(val cache: LocalCache) : + LiveData(LocalCacheState(cache)) { // Refreshes observers in batches. var handlerWaiting = AtomicBoolean() diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt index 75ce41ca2..2464eda1b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt @@ -25,7 +25,12 @@ class LnZapRequestEvent( companion object { const val kind = 9734 - fun create(originalNote: EventInterface, relays: Set, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent { + fun create( + originalNote: EventInterface, + relays: Set, + privateKey: ByteArray, + createdAt: Long = Date().time / 1000 + ): LnZapRequestEvent { val content = "" val pubKey = Utils.pubkeyCreate(privateKey).toHexKey() var tags = listOf( @@ -42,7 +47,12 @@ class LnZapRequestEvent( return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey()) } - fun create(userHex: String, relays: Set, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent { + fun create( + userHex: String, + relays: Set, + privateKey: ByteArray, + createdAt: Long = Date().time / 1000 + ): LnZapRequestEvent { val content = "" val pubKey = Utils.pubkeyCreate(privateKey).toHexKey() val tags = listOf(