X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FLinkedElementRenderFilter.kt;fp=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FLinkedElementRenderFilter.kt;h=4536c042309a6e8da3e55e0e616417c833e14617;hp=a527a1d2fb9c27cf9bd203047a30f57fff4c1775;hb=613d9d78ad0382c6efb834bdf0a479737b59dc0e;hpb=2a202f56661ecbfb1be46066a1df7c4dad3042e3 diff --git a/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt index a527a1d..4536c04 100644 --- a/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt +++ b/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt @@ -1,11 +1,10 @@ package net.pterodactylus.sone.template import net.pterodactylus.sone.core.LinkedElement +import net.pterodactylus.sone.utils.asTemplate import net.pterodactylus.util.template.Filter import net.pterodactylus.util.template.TemplateContext import net.pterodactylus.util.template.TemplateContextFactory -import net.pterodactylus.util.template.TemplateParser -import java.io.StringReader import java.io.StringWriter import javax.inject.Inject @@ -15,11 +14,9 @@ import javax.inject.Inject class LinkedElementRenderFilter @Inject constructor(private val templateContextFactory: TemplateContextFactory): Filter { companion object { - private val loadedImageTemplate = """<%include linked/image.html>""".parse() - private val loadedHtmlPageTemplate = """<%include linked/html-page.html>""".parse() - private val notLoadedImageTemplate = """<%include linked/notLoaded.html>""".parse() - - private fun String.parse() = StringReader(this).use { TemplateParser.parse(it) }!! + private val loadedImageTemplate = """<%include linked/image.html>""".asTemplate() + private val loadedHtmlPageTemplate = """<%include linked/html-page.html>""".asTemplate() + private val notLoadedImageTemplate = """<%include linked/notLoaded.html>""".asTemplate() } override fun format(templateContext: TemplateContext?, data: Any?, parameters: Map?) =