From 1a0e70636add8e205774a509d8a1f63bacfbe12a Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Wed, 19 Mar 2025 04:57:44 -0400
Subject: [PATCH] [O] Proper null handling for json

---
 src/main/java/ext/Json.kt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ext/Json.kt b/src/main/java/ext/Json.kt
index 964b3b38..61cd6545 100644
--- a/src/main/java/ext/Json.kt
+++ b/src/main/java/ext/Json.kt
@@ -43,16 +43,18 @@ else JACKSON.readValue(this, cls)
 fun <T> T.toJson() = JACKSON.writeValueAsString(this)
 
 inline fun <reified T> String.json() = try {
-    JACKSON.readValue(this, T::class.java)
+    if (isEmpty() || this == "null") null
+    else JACKSON.readValue(this, T::class.java)
 }
 catch (e: Exception) {
     println("Failed to parse JSON: $this")
     throw e
 }
 
-fun String.jsonMap(): Map<String, Any?> = json()
-fun String.jsonArray(): List<Map<String, Any?>> = json()
-
+fun String.jsonMap(): Map<String, Any?> = json() ?: emptyMap()
+fun String.jsonArray(): List<Map<String, Any?>> = json() ?: emptyList()
+fun String.jsonMaybeMap(): Map<String, Any?>? = json()
+fun String.jsonMaybeArray(): List<Map<String, Any?>>? = json()
 
 // KotlinX Serialization
 @OptIn(ExperimentalSerializationApi::class)