diff --git a/core/markdown/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/markdown/Regexes.kt b/core/markdown/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/markdown/Regexes.kt index 060b48788..4a2731b8a 100644 --- a/core/markdown/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/markdown/Regexes.kt +++ b/core/markdown/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/markdown/Regexes.kt @@ -1,7 +1,7 @@ package com.github.diegoberaldin.raccoonforlemmy.core.markdown internal object SpoilerRegex { - val spoilerOpening = Regex("(:::\\s+spoiler\\s+)(?.*)") + val spoilerOpening = Regex("(:::\\s?spoiler\\s+)(?<title>.*)") val spoilerClosing = Regex(":::") } diff --git a/core/markdown/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/markdown/Utils.kt b/core/markdown/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/markdown/Utils.kt index 390b08858..e83e56295 100644 --- a/core/markdown/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/markdown/Utils.kt +++ b/core/markdown/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/markdown/Utils.kt @@ -44,9 +44,9 @@ private fun String.spoilerFixUp(): String = run { finalLinesSizeAtLastSpoiler = finalLines.size } else if (line.isNotBlank()) { if (isSpoilerOnTopOfStack) { - // removes list inside spoilers + // removes list and blank lines inside spoilers val cleanLine = line.replace(Regex("^\\s*?- "), "").trim() - if (cleanLine.isNotEmpty()) { + if (cleanLine.isNotBlank()) { finalLines += cleanLine } } else {