diff --git a/modules/joex/src/main/scala/docspell/joex/extract/JsoupSanitizer.scala b/modules/joex/src/main/scala/docspell/joex/extract/JsoupSanitizer.scala index 52589148..d78fefbd 100644 --- a/modules/joex/src/main/scala/docspell/joex/extract/JsoupSanitizer.scala +++ b/modules/joex/src/main/scala/docspell/joex/extract/JsoupSanitizer.scala @@ -7,7 +7,7 @@ import java.nio.charset.Charset object JsoupSanitizer { - val change = + private val change = BodyClean.whitelistClean(EmailWhitelist.default) def clean(html: String): String = diff --git a/modules/joex/src/main/scala/docspell/joex/mail/ReadMail.scala b/modules/joex/src/main/scala/docspell/joex/mail/ReadMail.scala index 280c23c0..0cf60538 100644 --- a/modules/joex/src/main/scala/docspell/joex/mail/ReadMail.scala +++ b/modules/joex/src/main/scala/docspell/joex/mail/ReadMail.scala @@ -7,10 +7,9 @@ import emil.{MimeType => _, _} import emil.javamail.syntax._ import emil.tnef.TnefExtract import emil.markdown._ -import emil.jsoup.HtmlBodyView +import emil.jsoup._ import docspell.common._ -import docspell.joex.extract.JsoupSanitizer object ReadMail { @@ -34,8 +33,9 @@ object ReadMail { HtmlBodyView( mail.body, Some(mail.header), - Some(MarkdownBody.makeHtml(markdownCfg)), - Some(JsoupSanitizer.change) + HtmlBodyViewConfig.default.copy( + textToHtml = MarkdownBody.makeHtml(markdownCfg) + ) ).map(makeHtmlBinary[F] _).map(b => Some(b)) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c1200e5a..89ffb30b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val CalevVersion = "0.3.1" val CirceVersion = "0.13.0" val DoobieVersion = "0.9.0" - val EmilVersion = "0.5.1" + val EmilVersion = "0.6.0" val FastparseVersion = "2.1.3" val FlexmarkVersion = "0.61.28" val FlywayVersion = "6.4.2"