From 51335e06f1ddeac6c3a52fa5ee8a0645be2b942c Mon Sep 17 00:00:00 2001
From: Believethehype <1097224+believethehype@users.noreply.github.com>
Date: Thu, 16 May 2024 13:52:22 +0200
Subject: [PATCH] Fix order of Events in DVM feeds

---
 .../amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt
index 82398916b..6a8241713 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
@@ -63,14 +64,16 @@ open class NIP90ContentDiscoveryFilter(
 
             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)
             var json = mapper.readValue(eventContent, Array::class.java)
             for (element in json) {
                 // var test = mapper.readValue(element.toString(), Array::class.java)
                 // TODO. This is ugly. how to Kotlin?
+
                 var id = element.toString().trimStart('[').trimStart('e').trimStart(',').trimEnd(']').trimStart().trimEnd()
                 var note = LocalCache.checkGetOrCreateNote(id)
+
                 if (note != null) {
                     collection.add(note)
                 }
@@ -78,7 +81,7 @@ open class NIP90ContentDiscoveryFilter(
 
             return collection.toList()
         } else {
-            return sort(notes)
+            return listOf()
         }
     }
 
@@ -112,7 +115,7 @@ open class NIP90ContentDiscoveryFilter(
             var eventContent = note.event?.content()
             println(eventContent)
 
-            val collection: HashSet<Note> = hashSetOf()
+            val collection: MutableSet<Note> = mutableSetOf()
             val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
             var json = mapper.readValue(eventContent, Array::class.java)
             for (element in json) {
@@ -122,12 +125,13 @@ open class NIP90ContentDiscoveryFilter(
 
                 val note = LocalCache.checkGetOrCreateNote(id)
                 if (note != null) {
+                    println(note.id().toHexKey())
                     collection.add(note)
                 }
             }
             return collection
         } else {
-            return notes
+            return hashSetOf()
         }
     }