Fix extractFacets to parse URL endings correctly

uakihir0 · Feb 7, 2024 · 2da8539 · 2da8539
1 parent a798a31
commit 2da8539
Show file tree

Hide file tree

Showing 2 changed files with 106 additions and 10 deletions.
diff --git a/core/src/commonMain/kotlin/work/socialhub/kbsky/util/facet/FacetUtil.kt b/core/src/commonMain/kotlin/work/socialhub/kbsky/util/facet/FacetUtil.kt
@@ -48,7 +48,7 @@ object FacetUtil {
 
             // 前後の文字列を切り出す
             val before = str.substring(0, start)
-            str = str.substring(end)
+            str = str.substring(end + 1)
 
             // 前の部分について Text として登録
             if (before.isNotEmpty()) {

diff --git a/core/src/jvmTest/kotlin/work/socialhub/kbsky/util/FacetsTest.kt b/core/src/jvmTest/kotlin/work/socialhub/kbsky/util/FacetsTest.kt
@@ -4,9 +4,11 @@ import work.socialhub.kbsky.model.bsky.richtext.RichtextFacet
 import work.socialhub.kbsky.model.bsky.richtext.RichtextFacetLink
 import work.socialhub.kbsky.model.bsky.richtext.RichtextFacetMention
 import work.socialhub.kbsky.util.facet.FacetList
+import work.socialhub.kbsky.util.facet.FacetType
 import work.socialhub.kbsky.util.facet.FacetUtil
 import java.nio.charset.StandardCharsets
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class FacetsTest {
 
@@ -35,32 +37,126 @@ class FacetsTest {
         )
     }
 
+    @Test
+    fun testExtractFacets2() {
+        val text = "こんにちは https://yahoo.co.jp"
+
+        val facets = FacetUtil.extractFacets(text)
+        print(facets)
+        print(facets.richTextFacets(mutableMapOf()))
+
+        assertEquals(2, facets.records.size)
+        assertEquals("こんにちは ", facets.records[0].contentText)
+        assertEquals("こんにちは ", facets.records[0].displayText)
+        assertEquals("https://yahoo.co.jp", facets.records[1].contentText)
+        assertEquals("yahoo.co.jp", facets.records[1].displayText)
+    }
+
+    @Test
+    fun testExtractFacets3() {
+        val text = "こんにちは https://yahoo.co.jp ほげ"
+
+        val facets = FacetUtil.extractFacets(text)
+        print(facets)
+        print(facets.richTextFacets(mutableMapOf()))
+
+        assertEquals(3, facets.records.size)
+        assertEquals("こんにちは ", facets.records[0].contentText)
+        assertEquals("こんにちは ", facets.records[0].displayText)
+        assertEquals("https://yahoo.co.jp", facets.records[1].contentText)
+        assertEquals("yahoo.co.jp", facets.records[1].displayText)
+        assertEquals(" ほげ", facets.records[2].contentText)
+        assertEquals(" ほげ", facets.records[2].displayText)
+    }
+
+    @Test
+    fun testExtractFacets4() {
+        val text = "こんにちは https://yahoo.co.jp ほげ https://www.itmedia.co.jp/news/articles/2402/07/news082.html"
+
+        val facets = FacetUtil.extractFacets(text)
+        print(facets)
+        print(facets.richTextFacets(mutableMapOf()))
+
+        assertEquals(4, facets.records.size)
+        assertEquals("こんにちは ", facets.records[0].contentText)
+        assertEquals("こんにちは ", facets.records[0].displayText)
+        assertEquals("https://yahoo.co.jp", facets.records[1].contentText)
+        assertEquals("yahoo.co.jp", facets.records[1].displayText)
+        assertEquals(" ほげ ", facets.records[2].contentText)
+        assertEquals(" ほげ ", facets.records[2].displayText)
+        assertEquals("https://www.itmedia.co.jp/news/articles/2402/07/news082.html", facets.records[3].contentText)
+        assertEquals("www.itmedia.co.jp/news/arti...", facets.records[3].displayText)
+    }
+
+    @Test
+    fun testExtractFacets5() {
+        val text = "@takke @zonepane こんにちは https://yahoo.co.jp ほげ"
+
+        val facets = FacetUtil.extractFacets(text)
+        print(facets)
+        print(facets.richTextFacets(mutableMapOf()))
+
+        assertEquals(6, facets.records.size)
+        facets.records[0].let {
+            assertEquals(FacetType.Mention, it.type)
+            assertEquals("@takke", it.contentText)
+            assertEquals("@takke", it.displayText)
+        }
+        facets.records[1].let {
+            assertEquals(FacetType.Text, it.type)
+            assertEquals(" ", it.contentText)
+            assertEquals(" ", it.displayText)
+        }
+        facets.records[2].let {
+            assertEquals(FacetType.Mention, it.type)
+            assertEquals("@zonepane", it.contentText)
+            assertEquals("@zonepane", it.displayText)
+        }
+        facets.records[3].let {
+            assertEquals(FacetType.Text, it.type)
+            assertEquals(" こんにちは ", it.contentText)
+            assertEquals(" こんにちは ", it.displayText)
+        }
+        facets.records[4].let {
+            assertEquals(FacetType.Link, it.type)
+            assertEquals("https://yahoo.co.jp", it.contentText)
+            assertEquals("yahoo.co.jp", it.displayText)
+        }
+        facets.records[5].let {
+            assertEquals(FacetType.Text, it.type)
+            assertEquals(" ほげ", it.contentText)
+            assertEquals(" ほげ", it.displayText)
+        }
+    }
+
 
     private fun print(records: FacetList) {
+        println("facet list: ${records.records.size} ${records.displayText()}")
         for (record in records.records) {
-            println("TYPE: " + record.type)
-            println("CTEXT: " + record.contentText)
-            println("DTEXT: " + record.displayText)
+            println("- TYPE: " + record.type)
+            println("  CTEXT: " + record.contentText)
+            println("  DTEXT: " + record.displayText)
         }
     }
 
     private fun print(richTextFacets: List<RichtextFacet>) {
+        println("richTextFacets: ")
         for (facet in richTextFacets) {
             val index = checkNotNull(facet.index)
             val features = checkNotNull(facet.features)
 
-            println("TYPE: " + facet.type)
-            println("START: " + index.byteStart)
-            println("END: " + index.byteEnd)
+            println("- TYPE: " + facet.type)
+            println("  START: " + index.byteStart)
+            println("  END: " + index.byteEnd)
 
             for (feature in features) {
 
-                println("UNION: " + feature.type)
+                println("  - UNION: " + feature.type)
                 if (feature is RichtextFacetLink) {
-                    println("LINK: " + feature.uri)
+                    println("    LINK: " + feature.uri)
                 }
                 if (feature is RichtextFacetMention) {
-                    println("MENTION: " + feature.did)
+                    println("    MENTION: " + feature.did)
                 }
             }
         }