X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FRenderFilter.kt;h=420f77c56b104a2f4c8919b9258eef0d4e377630;hp=43331c36550b996032df7de519199bb8c6024ea8;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae diff --git a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt index 43331c3..420f77c 100644 --- a/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt +++ b/src/main/kotlin/net/pterodactylus/sone/template/RenderFilter.kt @@ -20,8 +20,6 @@ import java.net.URLEncoder /** * 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 { @@ -101,7 +99,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",