X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRenderFilter.kt;fp=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRenderFilter.kt;h=43331c36550b996032df7de519199bb8c6024ea8;hp=0db2a29f6111399c3a34913ed4b390d344f19361;hb=613d9d78ad0382c6efb834bdf0a479737b59dc0e;hpb=2a202f56661ecbfb1be46066a1df7c4dad3042e3 diff --git a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt index 0db2a29..43331c3 100644 --- a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt +++ b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt @@ -10,11 +10,10 @@ import net.pterodactylus.sone.text.PostPart import net.pterodactylus.sone.text.SonePart import net.pterodactylus.sone.text.SoneTextParser import net.pterodactylus.sone.text.SoneTextParserContext +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 java.io.Writer import java.net.URLEncoder @@ -27,8 +26,8 @@ import java.net.URLEncoder class RenderFilter(private val core: Core, private val templateContextFactory: TemplateContextFactory) : Filter { companion object { - private val plainTextTemplate = TemplateParser.parse(StringReader("<%text|html>")) - private val linkTemplate = TemplateParser.parse(StringReader("\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html>")) + private val plainTextTemplate = "<%text|html>".asTemplate() + private val linkTemplate = "\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html>".asTemplate() } override fun format(templateContext: TemplateContext?, data: Any?, parameters: MutableMap?): Any? {