highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-26 20:56:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forces the ZapRequest to exist when processing the LnZapEvent.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-09-09 14:32:27 -04:00
parent d723a8ab5c
commit be2402702f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
View File

@@ -98,6 +98,8 @@ object LocalCache {
checkNotInMainThread() checkNotInMainThread()
return notes.get(idHex) ?: run { return notes.get(idHex) ?: run {
require(isValidHex(idHex))
val newObject = Note(idHex) val newObject = Note(idHex)
notes.putIfAbsent(idHex, newObject) ?: newObject notes.putIfAbsent(idHex, newObject) ?: newObject
} }
@@ -807,23 +809,23 @@ object LocalCache {
// Already processed this event. // Already processed this event.
if (note.event != null) return if (note.event != null) return
val zapRequest = event.zapRequest?.id?.let { getOrCreateNote(it) } val zapRequest = event.zapRequest?.id?.let { getNoteIfExists(it) }
if (zapRequest == null || zapRequest.event !is LnZapRequestEvent) {
Log.e("ZP", "Zap Request not found. Unable to process Zap {${event.toJson()}}")
return
}
val author = getOrCreateUser(event.pubKey) val author = getOrCreateUser(event.pubKey)
val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) } val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } + val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
event.taggedAddresses().map { getOrCreateAddressableNote(it) } + event.taggedAddresses().map { getOrCreateAddressableNote(it) } +
( (
(zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>() (zapRequest.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>()
) )
note.loadEvent(event, author, repliesTo) note.loadEvent(event, author, repliesTo)
if (zapRequest == null) {
Log.e("ZP", "Zap Request not found. Unable to process Zap {${event.toJson()}}")
return
}
// Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}") // Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
repliesTo.forEach { repliesTo.forEach {