wip

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/other/DefaultPostContentFormatter.kt

@@ -43,6 +43,8 @@ class DefaultPostContentFormatter(private val policyFactory: PolicyFactory) : Po
 
         // 文字だけのHTMLなどはここでpタグで囲む
         val flattenHtml = unsafeElement.childNodes().mapNotNull {
+            println(it.toString())
+            println(it.javaClass)
             if (it is Element) {
                 it
             } else if (it is TextNode) {
@@ -57,6 +59,8 @@ class DefaultPostContentFormatter(private val policyFactory: PolicyFactory) : Po
 
         val safeHtml = policyFactory.sanitize(unsafeHtml)
 
+        println(safeHtml)
+
         val safeDocument =
             Jsoup.parseBodyFragment(safeHtml).getElementsByTag("body").first() ?: return FormattedPostContent("", "")
 
@@ -71,11 +75,25 @@ class DefaultPostContentFormatter(private val policyFactory: PolicyFactory) : Po
                 if (childNode is Element && childNode.tagName() == "br") {
                     brCount++
                 } else if (brCount >= 2) {
-                    formattedHtml.add(Element("p").appendChildren(childNodes.subList(prevIndex, index - brCount)))
+                    formattedHtml.add(
+                        Element(element.tag(), element.baseUri(), element.attributes()).appendChildren(
+                            childNodes.subList(
+                                prevIndex,
+                                index - brCount
+                            )
+                        )
+                    )
                     prevIndex = index
                 }
             }
-            formattedHtml.add(Element("p").appendChildren(childNodes.subList(prevIndex, childNodes.size)))
+            formattedHtml.add(
+                Element(element.tag(), element.baseUri(), element.attributes()).appendChildren(
+                    childNodes.subList(
+                        prevIndex,
+                        childNodes.size
+                    )
+                )
+            )
         }
 
         val elements = Elements(formattedHtml)

hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/DefaultPostContentFormatterTest.kt

@@ -0,0 +1,56 @@
+package dev.usbharu.hideout.core.infrastructure.other
+
+import dev.usbharu.hideout.core.config.HtmlSanitizeConfig
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.InjectMocks
+import org.mockito.Spy
+import org.mockito.junit.jupiter.MockitoExtension
+
+@ExtendWith(MockitoExtension::class)
+class DefaultPostContentFormatterTest {
+    @InjectMocks
+    lateinit var formatter: DefaultPostContentFormatter
+
+    @Spy
+    val policyFactory = HtmlSanitizeConfig().policy()
+
+    @Test
+    fun 文字だけのHTMLをPで囲む() {
+        formatter.format("a")
+    }
+
+    @Test
+    fun エレメントはそのまま() {
+        formatter.format("<p>a</p>")
+    }
+
+    @Test
+    fun コメントは無視() {
+        formatter.format("<!-- aa -->")
+    }
+
+    @Test
+    fun brタグを改行に() {
+        formatter.format("<p>a<br></p>")
+    }
+
+    @Test
+    fun brタグ2連続を段落に() {
+        val format = formatter.format("<p>a<br><br>a</p>")
+
+        println(format)
+    }
+
+    @Test
+    fun aタグは許可される() {
+        val format = formatter.format("<a href=\"https://example.com\">p</a>")
+
+        println(format)
+    }
+
+    @Test
+    fun pの中のaタグも許可される() {
+        formatter.format("<p><a href=\"https://example.com\">a</a></p>")
+    }
+}