From 9a0c99865409defbfe55850dbe3aaffb2909813e Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 27 Nov 2024 10:24:09 -0500
Subject: [PATCH] Fixes "null" strings on profile fields.

---
 .../amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt        | 2 +-
 .../java/com/vitorpamplona/quartz/events/ContactListEvent.kt    | 2 ++
 .../main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt
index 6b45058fb..c0c5d83fc 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt
@@ -1016,7 +1016,7 @@ private fun DrawAdditionalInfo(
                 fontSize = 25.sp,
             )
             Spacer(StdHorzSpacer)
-            user.info?.pronouns.let {
+            user.info?.pronouns?.let {
                 Text(
                     text = "($it)",
                     modifier = Modifier,
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/ContactListEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/ContactListEvent.kt
index 20552e20e..cbdf74a31 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/ContactListEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/ContactListEvent.kt
@@ -465,6 +465,8 @@ class UserMetadata {
     fun profilePicture(): String? = picture
 
     fun cleanBlankNames() {
+        if (pronouns == "null") pronouns = null
+
         if (picture?.isNotEmpty() == true) picture = picture?.trim()
         if (nip05?.isNotEmpty() == true) nip05 = nip05?.trim()
         if (displayName?.isNotEmpty() == true) displayName = displayName?.trim()
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt
index adb1a8267..03c75f878 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt
@@ -283,7 +283,7 @@ class MetadataEvent(
             key: String,
             value: String,
         ) {
-            if (value.isBlank()) {
+            if (value.isBlank() || value == "null") {
                 currentJson.remove(key)
             } else {
                 currentJson.put(key, value.trim())