X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FLinkedElementRenderFilter.kt;fp=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FLinkedElementRenderFilter.kt;h=e15f68ba2edeb0c44e86ea3cc9ab518f1129085c;hb=19e49c0a2463b90c3468903672d8ba600da217d2;hp=8d328be99df8939871252a63d2f1626426a16c57;hpb=992404e5183f824e478d6f2273d7998d48ceeea5;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt
index 8d328be..e15f68b 100644
--- a/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/template/LinkedElementRenderFilter.kt
@@ -16,6 +16,7 @@ class LinkedElementRenderFilter @Inject constructor(private val templateContextF
 
 	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) }!!
@@ -24,7 +25,8 @@ class LinkedElementRenderFilter @Inject constructor(private val templateContextF
 	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
 			}
 
@@ -36,6 +38,15 @@ class LinkedElementRenderFilter @Inject constructor(private val templateContextF
 				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()