X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRenderFilter.kt;h=25df23989331148566599700433b459fd298a47e;hb=8e313509a42a8c638fcac018dd73dd975bf9cb68;hp=2c38e58d0cf2f47af4bf375994dfc327832ee0e5;hpb=36e854bb84277c97d7934535e534ca6e0fe22698;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 2c38e58..25df239 100644
--- a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt
@@ -10,15 +10,13 @@ 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 net.pterodactylus.util.template.TemplateParser
-import java.io.StringReader
 import java.io.StringWriter
 import java.io.Writer
 import java.net.URLEncoder
-import java.util.ArrayList
 
 /**
  * Renders a number of pre-parsed [Part] into a [String].
@@ -28,55 +26,18 @@ import java.util.ArrayList
 class RenderFilter(private val core: Core, private val templateContextFactory: TemplateContextFactory) : 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 plainTextTemplate = "<%text|html>".asTemplate()
+		private val linkTemplate = "<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>".asTemplate()
 	}
 
 	override fun format(templateContext: TemplateContext?, data: Any?, parameters: MutableMap<String, Any?>?): Any? {
 		@Suppress("UNCHECKED_CAST")
-		val parts = getPartsToRender(parameters, data as? Iterable<Part> ?: return null)
+		val parts = data as? Iterable<Part> ?: return null
 		val parsedTextWriter = StringWriter()
 		render(parsedTextWriter, parts)
 		return parsedTextWriter.toString()
 	}
 
-	private fun Map<String, Any?>.parseInt(key: String) = this[key]?.toString()?.toInt()
-
-	private fun getPartsToRender(parameters: MutableMap<String, Any?>?, parts: Iterable<Part>): Iterable<Part> {
-		val length = parameters?.parseInt("length") ?: -1
-		val cutOffLength = parameters?.parseInt("cut-off-length") ?: length
-		if (length > -1) {
-			var allPartsLength = 0
-			val shortenedParts = ArrayList<Part>()
-			for (part in parts) {
-				if (part is PlainTextPart) {
-					val longText = part.text
-					if (allPartsLength < cutOffLength) {
-						if (allPartsLength + longText.length > cutOffLength) {
-							shortenedParts.add(PlainTextPart(longText.substring(0, cutOffLength - allPartsLength) + "…"))
-						} else {
-							shortenedParts.add(part)
-						}
-					}
-					allPartsLength += longText.length
-				} else if (part is LinkPart) {
-					if (allPartsLength < cutOffLength) {
-						shortenedParts.add(part)
-					}
-					allPartsLength += part.text.length
-				} else {
-					if (allPartsLength < cutOffLength) {
-						shortenedParts.add(part)
-					}
-				}
-			}
-			if (allPartsLength >= length) {
-				return shortenedParts
-			}
-		}
-		return parts
-	}
-
 	private fun render(writer: Writer, parts: Iterable<Part>) {
 		parts.forEach { render(writer, it) }
 	}
@@ -90,7 +51,6 @@ class RenderFilter(private val core: Core, private val templateContextFactory: T
 			is SonePart -> render(writer, part)
 			is PostPart -> render(writer, part)
 			is FreemailPart -> render(writer, part)
-			is Iterable<*> -> render(writer, part as Iterable<Part>)
 		}
 	}
 
@@ -101,14 +61,14 @@ class RenderFilter(private val core: Core, private val templateContextFactory: T
 	}
 
 	private fun render(writer: Writer, freenetLinkPart: FreenetLinkPart) {
-		renderLink(writer, "/${freenetLinkPart.link}", freenetLinkPart.text, freenetLinkPart.title, if (freenetLinkPart.isTrusted) "freenet-trusted" else "freenet")
+		renderLink(writer, "/${freenetLinkPart.link}", freenetLinkPart.text, freenetLinkPart.title, if (freenetLinkPart.trusted) "freenet-trusted" else "freenet")
 	}
 
 	private fun render(writer: Writer, linkPart: LinkPart) {
 		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) {
@@ -141,7 +101,7 @@ 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 soneName = sone?.let(SoneAccessor::getNiceName) ?: freemailPart.identityId
 		renderLink(writer,
 				"/Freemail/NewMessage?to=${freemailPart.identityId}",
 				"${freemailPart.emailLocalPart}@$soneName.freemail",