highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-04-22 14:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

improving the filter for the request id of the cached response.

Browse Source
This commit is contained in:
Vitor Pamplona 2024-05-30 08:39:23 -04:00
parent 56d6376efc
commit a781e733f2
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
View File

@ -84,7 +84,6 @@ import com.vitorpamplona.quartz.events.EventInterface
import com.vitorpamplona.quartz.events.GiftWrapEvent
import com.vitorpamplona.quartz.events.LnZapEvent
import com.vitorpamplona.quartz.events.LnZapRequestEvent
import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryRequestEvent
import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
import com.vitorpamplona.quartz.events.Participant
import com.vitorpamplona.quartz.events.ReportEvent
@ -1362,7 +1361,7 @@ class AccountViewModel(val account: Account, val settings: SettingsState) : View
suspend fun cachedDVMContentDiscovery(pubkeyHex: String): Note? {
val fifteenMinsAgo = TimeUtils.fifteenMinutesAgo()
// First check if we have an actual response from the DVM in LocalCache
var response =
val response =
LocalCache.notes.maxOrNullOf(
filter = { key, note ->
val noteEvent = note.event
@ -1374,22 +1373,9 @@ class AccountViewModel(val account: Account, val settings: SettingsState) : View
comparator = CreatedAtComparator,
)
if (response == null) {
// If we don't have a cached NIP90 response, return null
return null
} else {
// If we have a response, get the tagged Request Event
var requestid = response.event?.tags()?.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
// Find and return the original Request Event on localCache, or null if not found
return LocalCache.notes.maxOrNullOf(
filter = { key, note ->
val noteEvent = note.event
noteEvent is NIP90ContentDiscoveryRequestEvent &&
noteEvent.isTaggedUser(pubkeyHex)
note.idHex == requestid
},
comparator = CreatedAtComparator,
)
// If we have a response, get the tagged Request Event otherwise null
return response?.event?.tags()?.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)?.let {
LocalCache.getOrCreateNote(it)
}
}