X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRenderFilter.kt;h=00015bb0783a973e9da5d7236fa98070477bc8ff;hp=9f785ca8c32efed8f9d7923764348f5aa1e69f34;hb=e3dced431a5e8622fc1de958f7a104a47ea73ec0;hpb=579f882ba9cc899613ef840d421db898b3ebbd73

diff --git a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt
index 9f785ca..00015bb 100644
--- a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt
@@ -1,34 +1,20 @@
 package net.pterodactylus.sone.template
 
-import net.pterodactylus.sone.core.Core
-import net.pterodactylus.sone.text.FreemailPart
-import net.pterodactylus.sone.text.FreenetLinkPart
-import net.pterodactylus.sone.text.LinkPart
+import net.pterodactylus.sone.database.*
+import net.pterodactylus.sone.text.*
 import net.pterodactylus.sone.text.Part
-import net.pterodactylus.sone.text.PlainTextPart
-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.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
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.util.template.*
+import java.io.*
+import java.net.*
 
 /**
  * Renders a number of pre-parsed [Part] into a [String].
- *
- * @author [David ‘Bombe’ Roden](mailto:bombe@pterodactylus.net)
  */
-class RenderFilter(private val core: Core, private val templateContextFactory: TemplateContextFactory) : Filter {
+class RenderFilter(private val soneProvider: SoneProvider, private val soneTextParser: SoneTextParser, htmlFilter: HtmlFilter) : Filter {
 
-	companion object {
-		private val plainTextTemplate = TemplateParser.parse(StringReader("<%text|html>"))
-		private val linkTemplate = TemplateParser.parse(StringReader("<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>"))
+	private val templateContextFactory = TemplateContextFactory().apply {
+		addFilter("html", htmlFilter)
 	}
 
 	override fun format(templateContext: TemplateContext?, data: Any?, parameters: MutableMap<String, Any?>?): Any? {
@@ -69,7 +55,7 @@ class RenderFilter(private val core: Core, private val templateContextFactory: T
 		renderLink(writer, "/external-link/?_CHECKED_HTTP_=${linkPart.link.urlEncode()}", linkPart.text, linkPart.title, "internet")
 	}
 
-	private fun String.urlEncode() = URLEncoder.encode(this, "UTF-8")!!
+	private fun String.urlEncode(): String = URLEncoder.encode(this, "UTF-8")
 
 	private fun render(writer: Writer, sonePart: SonePart) {
 		if (sonePart.sone.name != null) {
@@ -80,9 +66,8 @@ class RenderFilter(private val core: Core, private val templateContextFactory: T
 	}
 
 	private fun render(writer: Writer, postPart: PostPart) {
-		val parser = SoneTextParser(core, core)
 		val parserContext = SoneTextParserContext(postPart.post.sone)
-		val parts = parser.parse(postPart.post.text, parserContext)
+		val parts = soneTextParser.parse(postPart.post.text, parserContext)
 		val excerpt = StringBuilder()
 		for (part in parts) {
 			excerpt.append(part.text)
@@ -101,8 +86,8 @@ class RenderFilter(private val core: Core, private val templateContextFactory: T
 	}
 
 	private fun render(writer: Writer, freemailPart: FreemailPart) {
-		val sone = core.getSone(freemailPart.identityId)
-		val soneName = sone.transform(SoneAccessor::getNiceName).or(freemailPart.identityId)
+		val sone = soneProvider.getSone(freemailPart.identityId)
+		val soneName = sone?.let(SoneAccessor::getNiceName) ?: freemailPart.identityId
 		renderLink(writer,
 				"/Freemail/NewMessage?to=${freemailPart.identityId}",
 				"${freemailPart.emailLocalPart}@$soneName.freemail",
@@ -120,3 +105,6 @@ class RenderFilter(private val core: Core, private val templateContextFactory: T
 	}
 
 }
+
+private val plainTextTemplate = "<%text|html>".asTemplate()
+private val linkTemplate = "<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>".asTemplate()