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

Fix order of Events in DVM feeds

Browse Source
This commit is contained in:
Believethehype
2024-05-16 13:52:22 +02:00
parent 283d52ac2f
commit 51335e06f1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt
+8 -4
View File
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.vitorpamplona.amethyst.model.Account import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.LocalCache import com.vitorpamplona.amethyst.model.LocalCache
import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.quartz.encoders.toHexKey
import com.vitorpamplona.quartz.events.MuteListEvent import com.vitorpamplona.quartz.events.MuteListEvent
import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
import com.vitorpamplona.quartz.events.PeopleListEvent import com.vitorpamplona.quartz.events.PeopleListEvent
@@ -63,14 +64,16 @@ open class NIP90ContentDiscoveryFilter(
var eventContent = note.event?.content() var eventContent = note.event?.content()
var collection: HashSet<Note> = hashSetOf() var collection: MutableSet<Note> = mutableSetOf()
val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
var json = mapper.readValue(eventContent, Array::class.java) var json = mapper.readValue(eventContent, Array::class.java)
for (element in json) { for (element in json) {
// var test = mapper.readValue(element.toString(), Array::class.java) // var test = mapper.readValue(element.toString(), Array::class.java)
// TODO. This is ugly. how to Kotlin? // TODO. This is ugly. how to Kotlin?
var id = element.toString().trimStart('[').trimStart('e').trimStart(',').trimEnd(']').trimStart().trimEnd() var id = element.toString().trimStart('[').trimStart('e').trimStart(',').trimEnd(']').trimStart().trimEnd()
var note = LocalCache.checkGetOrCreateNote(id) var note = LocalCache.checkGetOrCreateNote(id)
if (note != null) { if (note != null) {
collection.add(note) collection.add(note)
} }
@@ -78,7 +81,7 @@ open class NIP90ContentDiscoveryFilter(
return collection.toList() return collection.toList()
} else { } else {
return sort(notes) return listOf()
} }
} }
@@ -112,7 +115,7 @@ open class NIP90ContentDiscoveryFilter(
var eventContent = note.event?.content() var eventContent = note.event?.content()
println(eventContent) println(eventContent)
val collection: HashSet<Note> = hashSetOf() val collection: MutableSet<Note> = mutableSetOf()
val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
var json = mapper.readValue(eventContent, Array::class.java) var json = mapper.readValue(eventContent, Array::class.java)
for (element in json) { for (element in json) {
@@ -122,12 +125,13 @@ open class NIP90ContentDiscoveryFilter(
val note = LocalCache.checkGetOrCreateNote(id) val note = LocalCache.checkGetOrCreateNote(id)
if (note != null) { if (note != null) {
println(note.id().toHexKey())
collection.add(note) collection.add(note)
} }
} }
return collection return collection
} else { } else {
return notes return hashSetOf()
} }
} }