mirror of https://github.com/usbharu/Hideout.git
Merge remote-tracking branch 'origin/feature/post-decoration' into feature/post-decoration
This commit is contained in:
commit
82f2742c0c
|
@ -11,8 +11,7 @@ import org.springframework.stereotype.Service
|
|||
@Service
|
||||
class DefaultPostContentFormatter(private val policyFactory: PolicyFactory) : PostContentFormatter {
|
||||
override fun format(content: String): FormattedPostContent {
|
||||
|
||||
//まず不正なHTMLを整形する
|
||||
// まず不正なHTMLを整形する
|
||||
val document = Jsoup.parseBodyFragment(content)
|
||||
val outputSettings = Document.OutputSettings()
|
||||
outputSettings.prettyPrint(false)
|
||||
|
@ -24,8 +23,7 @@ class DefaultPostContentFormatter(private val policyFactory: PolicyFactory) : Po
|
|||
""
|
||||
)
|
||||
|
||||
|
||||
//文字だけのHTMLなどはここでpタグで囲む
|
||||
// 文字だけのHTMLなどはここでpタグで囲む
|
||||
val flattenHtml = unsafeElement.childNodes().mapNotNull {
|
||||
if (it is Element) {
|
||||
it
|
||||
|
@ -36,7 +34,6 @@ class DefaultPostContentFormatter(private val policyFactory: PolicyFactory) : Po
|
|||
}
|
||||
}.filter { it.text().isNotBlank() }
|
||||
|
||||
|
||||
// HTMLのサニタイズをする
|
||||
val unsafeHtml = Elements(flattenHtml).outerHtml()
|
||||
|
||||
|
@ -47,8 +44,7 @@ class DefaultPostContentFormatter(private val policyFactory: PolicyFactory) : Po
|
|||
|
||||
val formattedHtml = mutableListOf<Element>()
|
||||
|
||||
|
||||
//連続するbrタグを段落に変換する
|
||||
// 連続するbrタグを段落に変換する
|
||||
for (element in safeDocument.children()) {
|
||||
var brCount = 0
|
||||
var prevIndex = 0
|
||||
|
@ -64,7 +60,6 @@ class DefaultPostContentFormatter(private val policyFactory: PolicyFactory) : Po
|
|||
formattedHtml.add(Element("p").appendChildren(childNodes.subList(prevIndex, childNodes.size)))
|
||||
}
|
||||
|
||||
|
||||
val elements = Elements(formattedHtml)
|
||||
|
||||
return FormattedPostContent(elements.outerHtml().replace("\n", ""), printHtml(elements))
|
||||
|
|
Loading…
Reference in New Issue