Add test for get post ajax page
[Sone.git] / src / main / kotlin / net / pterodactylus / sone / template / LinkedElementRenderFilter.kt
index a527a1d..4536c04 100644 (file)
@@ -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<String, Any?>?) =