Merge branch 'vitorpamplona:main' into kmp-completeness

quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/filters/FilterDeserializer.kt

@@ -52,15 +52,15 @@ class ManualFilterDeserializer {
             }
 
             return Filter(
-                ids = jsonObject.get("ids").mapNotNull { it.asTextOrNull() },
-                authors = jsonObject.get("authors").mapNotNull { it.asTextOrNull() },
-                kinds = jsonObject.get("kinds").mapNotNull { it.asIntOrNull() },
-                tags = tagsIn.associateWith { jsonObject.get(it).mapNotNull { it.asTextOrNull() } },
-                tagsAll = tagsAll.associateWith { jsonObject.get(it).mapNotNull { it.asTextOrNull() } },
-                since = jsonObject.get("since").asLongOrNull(),
-                until = jsonObject.get("until").asLongOrNull(),
-                limit = jsonObject.get("limit").asIntOrNull(),
-                search = jsonObject.get("search").asTextOrNull(),
+                ids = jsonObject.get("ids")?.mapNotNull { it.asTextOrNull() },
+                authors = jsonObject.get("authors")?.mapNotNull { it.asTextOrNull() },
+                kinds = jsonObject.get("kinds")?.mapNotNull { it.asIntOrNull() },
+                tags = tagsIn.associateWith { jsonObject.get("#$it").mapNotNull { it.asTextOrNull() } },
+                tagsAll = tagsAll.associateWith { jsonObject.get("&$it").mapNotNull { it.asTextOrNull() } },
+                since = jsonObject.get("since")?.asLongOrNull(),
+                until = jsonObject.get("until")?.asLongOrNull(),
+                limit = jsonObject.get("limit")?.asIntOrNull(),
+                search = jsonObject.get("search")?.asTextOrNull(),
             )
         }
     }

quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/jackson/JacksonMapperTest.kt

@@ -21,6 +21,7 @@
 package com.vitorpamplona.quartz.nip01Core.jackson
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate
 import com.vitorpamplona.quartz.nip51Lists.followList.FollowListEvent
 import com.vitorpamplona.quartz.nip59Giftwrap.rumors.Rumor
@@ -152,4 +153,28 @@ class JacksonMapperTest {
             assertContentEquals(tag, deserialized.tags[index])
         }
     }
+
+    @Test
+    fun shouldNotThrowExceptionWhenDeserializingEmptyFilter() {
+        val json = Filter().toJson()
+        val deserialized = JacksonMapper.fromJsonTo<Filter>(json)
+
+        assertEquals(null, deserialized.ids)
+    }
+
+    @Test
+    fun shouldNotThrowExceptionWhenDeserializingFilterTags() {
+        val expectedTagValue = "3c39a7b53dec9ac85acf08b267637a9841e6df7b7b0f5e2ac56a8cf107de37da"
+        val json =
+            Filter(
+                tags = mapOf("p" to listOf(expectedTagValue)),
+                tagsAll = mapOf("p" to listOf(expectedTagValue)),
+            ).toJson()
+        val deserialized = JacksonMapper.fromJsonTo<Filter>(json)
+
+        assertEquals(true, deserialized.tags?.keys?.contains("p"))
+        assertEquals(listOf(expectedTagValue), deserialized.tags?.get("p"))
+        assertEquals(true, deserialized.tagsAll?.keys?.contains("p"))
+        assertEquals(listOf(expectedTagValue), deserialized.tagsAll?.get("p"))
+    }
 }