Merge pull request #1571 from DimensionDev/bugfix/misskey_login

Add MisskeyEmojiMapSerializer and update models to use it for emojis

Author: Tlaster

shared/src/commonMain/kotlin/dev/dimension/flare/data/network/misskey/api/model/Note.kt

@@ -15,6 +15,7 @@
 
 package dev.dimension.flare.data.network.misskey.api.model
 
+import dev.dimension.flare.data.network.misskey.api.serializer.MisskeyEmojiMapSerializer
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -54,5 +55,6 @@ internal data class Note(
     @SerialName(value = "uri") val uri: kotlin.String? = null,
     @SerialName(value = "url") val url: kotlin.String? = null,
     @SerialName(value = "myReaction") val myReaction: kotlin.String? = null,
+    @Serializable(with = MisskeyEmojiMapSerializer::class)
     @SerialName(value = "emojis") val emojis: Map<kotlin.String, kotlin.String> = emptyMap(),
 )

shared/src/commonMain/kotlin/dev/dimension/flare/data/network/misskey/api/model/User.kt

@@ -15,6 +15,7 @@
 
 package dev.dimension.flare.data.network.misskey.api.model
 
+import dev.dimension.flare.data.network.misskey.api.serializer.MisskeyEmojiMapSerializer
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -102,6 +103,7 @@ internal data class User(
     @SerialName(value = "email") val email: kotlin.String? = null,
     @SerialName(value = "emailVerified") val emailVerified: kotlin.Boolean? = null,
     @SerialName(value = "securityKeysList") val securityKeysList: kotlin.collections.List<kotlin.String>? = null,
+    @Serializable(with = MisskeyEmojiMapSerializer::class)
     @SerialName(value = "emojis") val emojis: Map<kotlin.String, kotlin.String> = emptyMap(),
 ) {
     /**

shared/src/commonMain/kotlin/dev/dimension/flare/data/network/misskey/api/model/UserLite.kt

@@ -15,6 +15,7 @@
 
 package dev.dimension.flare.data.network.misskey.api.model
 
+import dev.dimension.flare.data.network.misskey.api.serializer.MisskeyEmojiMapSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -36,7 +37,9 @@ internal data class UserLite(
     @SerialName(value = "isModerator") val isModerator: kotlin.Boolean? = false,
     @SerialName(value = "isBot") val isBot: kotlin.Boolean? = null,
     @SerialName(value = "isCat") val isCat: kotlin.Boolean? = null,
-    @SerialName(value = "emojis") val emojis: Map<kotlin.String, kotlin.String> = emptyMap(),
+    @SerialName(value = "emojis")
+    @Serializable(with = MisskeyEmojiMapSerializer::class)
+    val emojis: Map<kotlin.String, kotlin.String> = emptyMap(),
 ) {
     /**
      * *

shared/src/commonMain/kotlin/dev/dimension/flare/data/network/misskey/api/serializer/MisskeyEmojiMapSerializer.kt

@@ -0,0 +1,21 @@
+package dev.dimension.flare.data.network.misskey.api.serializer
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonNull
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonTransformingSerializer
+
+@OptIn(ExperimentalSerializationApi::class)
+internal object MisskeyEmojiMapSerializer :
+    JsonTransformingSerializer<Map<String, String>>(MapSerializer(String.serializer(), String.serializer())) {
+    override fun transformDeserialize(element: JsonElement): JsonElement =
+        when (element) {
+            is JsonObject -> element
+            is JsonArray, JsonNull -> JsonObject(emptyMap())
+            else -> JsonObject(emptyMap())
+        }
+}

shared/src/commonTest/kotlin/dev/dimension/flare/data/network/misskey/api/model/UserLiteTest.kt

@@ -0,0 +1,24 @@
+package dev.dimension.flare.data.network.misskey.api.model
+
+import dev.dimension.flare.common.JSON
+import kotlinx.serialization.decodeFromString
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class UserLiteTest {
+    @Test
+    fun emojisArrayIsTreatedAsEmptyMap() {
+        val payload =
+            """
+            {
+                "id": "user-id",
+                "username": "sample",
+                "emojis": []
+            }
+            """.trimIndent()
+
+        val userLite = JSON.decodeFromString(UserLite.serializer(), payload)
+
+        assertEquals(emptyMap(), userLite.emojis)
+    }
+}