From 80e58f72f8d3f3203979befe1040198b0bb73e20 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 7 Apr 2023 18:26:13 -0400
Subject: [PATCH] Fixes nprofile1 tags

---
 .../amethyst/ui/components/RichTextViewer.kt          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
index ed63f83c3..814de2ea2 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
@@ -283,7 +283,7 @@ private fun isArabic(text: String): Boolean {
 }
 
 fun isBechLink(word: String): Boolean {
-    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@").take(7)
+    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@")
 
     return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) }
 }
@@ -331,13 +331,11 @@ fun BechLink(word: String, canPreview: Boolean, backgroundColor: Color, accountV
             )
         } ?: nip19Route?.let {
             ClickableRoute(it, navController)
-        }
-            ?: Text(text = "$word ")
+        } ?: Text(text = "$word ")
     } else {
         nip19Route?.let {
             ClickableRoute(it, navController)
-        }
-            ?: Text(text = "$word ")
+        } ?: Text(text = "$word ")
     }
 }
 
@@ -412,10 +410,11 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
                 inlineContent = inlineContent
             )
         }
-        tagPair.second?.ifBlank { null }?.let {
+        tagPair.second?.ifBlank { "" }?.let {
             Text(text = "$it ")
         }
     } ?: Text(text = "$word ")
+
 }
 
 @Composable