X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRenderFilter.kt;h=00015bb0783a973e9da5d7236fa98070477bc8ff;hb=a73938206e78e061bc63db07391623ee6a218845;hp=43331c36550b996032df7de519199bb8c6024ea8;hpb=613d9d78ad0382c6efb834bdf0a479737b59dc0e;p=Sone.git
diff --git a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt
index 43331c3..00015bb 100644
--- a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt
@@ -1,33 +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.sone.utils.asTemplate
-import net.pterodactylus.util.template.Filter
-import net.pterodactylus.util.template.TemplateContext
-import net.pterodactylus.util.template.TemplateContextFactory
-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 = "<%text|html>".asTemplate()
- private val linkTemplate = "\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html>".asTemplate()
+ private val templateContextFactory = TemplateContextFactory().apply {
+ addFilter("html", htmlFilter)
}
override fun format(templateContext: TemplateContext?, data: Any?, parameters: MutableMap?): Any? {
@@ -79,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)
@@ -100,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",
@@ -119,3 +105,6 @@ class RenderFilter(private val core: Core, private val templateContextFactory: T
}
}
+
+private val plainTextTemplate = "<%text|html>".asTemplate()
+private val linkTemplate = "\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html>".asTemplate()