X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FLinkedElementRenderFilter.kt;h=200bd83de041de4c369f7051187988cb73fc0b2b;hp=5de5dfe77e499ce5e084b96b44e7c9e53db9e070;hb=047787883cea2957540331b4720d9a20167eb042;hpb=f7d0c519d77d47e61f2b6accad8c7f16a785b8be

diff --git a/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt
index 5de5dfe..200bd83 100644
--- a/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt
@@ -1,29 +1,25 @@
 package net.pterodactylus.sone.template
 
-import net.pterodactylus.sone.core.LinkedElement
-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 net.pterodactylus.sone.core.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.util.template.*
+import java.io.*
 
 /**
  * Renders all kinds of [LinkedElement]s.
  */
-class LinkedElementRenderFilter(private val templateContextFactory: TemplateContextFactory) : Filter {
+class LinkedElementRenderFilter : Filter {
 
-	companion object {
-		private val loadedImageTemplate = """<%include linked/image.html>""".parse()
-		private val notLoadedImageTemplate = """<%include linked/notLoaded.html>""".parse()
-
-		private fun String.parse() = StringReader(this).use { TemplateParser.parse(it) }!!
+	private val templateContextFactory = TemplateContextFactory().apply {
+		addFilter("html", HtmlFilter())
+		addProvider(ClassPathTemplateProvider(LinkedElementRenderFilter::class.java, "/templates/"))
 	}
 
 	override fun format(templateContext: TemplateContext?, data: Any?, parameters: Map<String, Any?>?) =
 			when {
 				data is LinkedElement && data.loading -> renderNotLoadedLinkedElement(data)
-				data is LinkedElement -> renderLinkedImage(data)
+				data is LinkedElement && data.properties["type"] == "image" -> renderLinkedImage(data)
+				data is LinkedElement && data.properties["type"] == "html" -> renderHtmlPage(data)
 				else -> null
 			}
 
@@ -31,16 +27,27 @@ class LinkedElementRenderFilter(private val templateContextFactory: TemplateCont
 			StringWriter().use {
 				val templateContext = templateContextFactory.createTemplateContext()
 				templateContext["link"] = linkedElement.link
-				loadedImageTemplate.render(templateContext, it)
-				it
+				it.also { loadedImageTemplate.render(templateContext, it) }
+			}.toString()
+
+	private fun renderHtmlPage(linkedElement: LinkedElement) =
+			StringWriter().use {
+				val templateContext = templateContextFactory.createTemplateContext()
+				templateContext["link"] = linkedElement.link
+				templateContext["title"] = linkedElement.properties["title"] ?: "No title"
+				templateContext["description"] = linkedElement.properties["description"] ?: "No description"
+				it.also { loadedHtmlPageTemplate.render(templateContext, it) }
 			}.toString()
 
 	private fun renderNotLoadedLinkedElement(linkedElement: LinkedElement) =
 			StringWriter().use {
 				val templateContext = templateContextFactory.createTemplateContext()
 				templateContext["link"] = linkedElement.link
-				notLoadedImageTemplate.render(templateContext, it)
-				it
+				it.also { notLoadedImageTemplate.render(templateContext, it) }
 			}.toString()
 
 }
+
+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()