From c7a41617995813f233dee78eb65c4ba13a5f730d Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 29 May 2024 12:50:46 -0400 Subject: [PATCH] Fixing tests --- .../amethyst/commons/richtext/RichTextParserTest.kt | 6 +++--- .../amethyst/commons/richtext/RichTextParser.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commons/src/androidTest/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParserTest.kt b/commons/src/androidTest/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParserTest.kt index 18066a291..bf98efcc3 100644 --- a/commons/src/androidTest/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParserTest.kt +++ b/commons/src/androidTest/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParserTest.kt @@ -690,7 +690,7 @@ class RichTextParserTest { RichTextParser() .parseText(textToParse, EmptyTagList) org.junit.Assert.assertEquals( - "relay.shitforce.one, relayable.org, universe.nostrich.land, nos.lol, universe.nostrich.land?lang=zh, universe.nostrich.land?lang=en, relay.damus.io, relay.nostr.wirednet.jp, offchain.pub, nostr.rocks, relay.wellorder.net, nostr.oxtr.dev, universe.nostrich.land?lang=ja, relay.mostr.pub, nostr.bitcoiner.social, Nostr-Check.com, MR.Rabbit, Ancap.su, zapper.lol, smies.me, baller.hodl", + "relay.shitforce.one, relayable.org, universe.nostrich.land, nos.lol, universe.nostrich.land?lang=zh, universe.nostrich.land?lang=en, relay.damus.io, relay.nostr.wirednet.jp, offchain.pub, nostr.rocks, relay.wellorder.net, nostr.oxtr.dev, universe.nostrich.land?lang=ja, relay.mostr.pub, nostr.bitcoiner.social, Nostr-Check.com, MR.Rabbit, Ancap.su, ⚡\uFE0Fsatscoinsv@getalby.com, miceliomad@miceliomad.github.io/nostr/, zapper.lol, smies.me, baller.hodl", state.urlSet.joinToString(", "), ) @@ -2258,7 +2258,7 @@ class RichTextParserTest { "HashTag(#214)", "RegularText(2%)", "RegularText(Satscoinsv,)", - "RegularText(⚡️satscoinsv@getalby.com)", + "Link(⚡️satscoinsv@getalby.com)", "RegularText(-)", "RegularText(80db64657ea0358c5332c5cca01565eeddd4b8799688b1c46d3cb2d7c966671f)", "HashTag(#215)", @@ -2468,7 +2468,7 @@ class RichTextParserTest { "HashTag(#249)", "RegularText(2%)", "RegularText(micmad,)", - "RegularText(miceliomad@miceliomad.github.io/nostr/)", + "Link(miceliomad@miceliomad.github.io/nostr/)", "RegularText(-)", "RegularText(cd806edcf8ff40ea94fa574ea9cd97da16e5beb2b85aac6e1d648b8388504343)", "HashTag(#250)", diff --git a/commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt b/commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt index b6fe3c727..77cc4355a 100644 --- a/commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt +++ b/commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt @@ -214,14 +214,14 @@ class RichTextParser() { if (word.startsWith("cashuA", true)) return CashuSegment(word) - if (startsWithNIP19Scheme(word)) return BechSegment(word) - if (word.startsWith("#")) return parseHash(word, tags) if (word.contains("@")) { if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) return EmailSegment(word) } + if (startsWithNIP19Scheme(word)) return BechSegment(word) + if (isPotentialPhoneNumber(word) && !isDate(word)) { if (Patterns.PHONE.matcher(word).matches()) return PhoneSegment(word) }