🔥 Remove path from FreenetTemplatePage

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / pages / SoneTemplatePage.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
index 54cd5cc..b288a4c 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -1,32 +1,30 @@
 package net.pterodactylus.sone.web.pages
 
-import freenet.clients.http.ToadletContext
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.main.SonePlugin
-import net.pterodactylus.sone.utils.emptyToNull
-import net.pterodactylus.sone.web.SessionProvider
-import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.sone.web.page.FreenetTemplatePage
-import net.pterodactylus.util.notify.Notification
-import net.pterodactylus.util.template.Template
-import net.pterodactylus.util.template.TemplateContext
-import java.net.URLEncoder
+import freenet.clients.http.*
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.notify.*
+import net.pterodactylus.util.template.*
+import net.pterodactylus.util.web.*
+import java.net.*
 
 /**
  * Base page for the Sone web interface.
  */
 open class SoneTemplatePage @JvmOverloads constructor(
-               path: String,
-               protected val webInterface: WebInterface,
-               template: Template,
+               private val webInterface: WebInterface,
+               loaders: Loaders,
+               templateRenderer: TemplateRenderer,
                private val pageTitleKey: String? = null,
                private val requiresLogin: Boolean = false,
                private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.l10n::getString) ?: "" }
-) : FreenetTemplatePage(path, webInterface.templateContextFactory, template, "noPermission.html") {
+) : FreenetTemplatePage(templateRenderer, loaders, "noPermission.html") {
 
        private val core = webInterface.core
-       protected val sessionProvider: SessionProvider = webInterface
+       private val sessionProvider: SessionProvider = webInterface
 
        protected fun getCurrentSone(toadletContext: ToadletContext, createSession: Boolean = true) =
                        sessionProvider.getCurrentSone(toadletContext, createSession)
@@ -36,14 +34,15 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
        fun requiresLogin() = requiresLogin
 
-       override public fun getPageTitle(freenetRequest: FreenetRequest) = pageTitle(freenetRequest)
+       override fun getPageTitle(request: FreenetRequest) = getPageTitle(request.toSoneRequest(core, webInterface))
 
-       override public fun getStyleSheets() =
-                       listOf("css/sone.css")
+       open fun getPageTitle(soneRequest: SoneRequest) = pageTitle(soneRequest)
 
-       override public fun getShortcutIcon() = "images/icon.png"
+       override val styleSheets = listOf("css/sone.css")
 
-       override public fun getAdditionalLinkNodes(request: FreenetRequest) =
+       override val shortcutIcon = "images/icon.png"
+
+       override fun getAdditionalLinkNodes(request: FreenetRequest) =
                        listOf(mapOf(
                                        "rel" to "search",
                                        "type" to "application/opensearchdescription+xml",
@@ -51,43 +50,50 @@ open class SoneTemplatePage @JvmOverloads constructor(
                                        "href" to "http://${request.httpRequest.getHeader("host")}/Sone/OpenSearch.xml"
                        ))
 
-       final override public fun processTemplate(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-               super.processTemplate(freenetRequest, templateContext)
+       final override fun processTemplate(request: FreenetRequest, templateContext: TemplateContext) {
+               super.processTemplate(request, templateContext)
                templateContext["preferences"] = core.preferences
-               templateContext["currentSone"] = getCurrentSone(freenetRequest.toadletContext)
+               templateContext["currentSone"] = getCurrentSone(request.toadletContext)
                templateContext["localSones"] = core.localSones
-               templateContext["request"] = freenetRequest
+               templateContext["request"] = request
                templateContext["currentVersion"] = SonePlugin.getPluginVersion()
                templateContext["hasLatestVersion"] = core.updateChecker.hasLatestVersion()
                templateContext["latestEdition"] = core.updateChecker.latestEdition
                templateContext["latestVersion"] = core.updateChecker.latestVersion
                templateContext["latestVersionTime"] = core.updateChecker.latestVersionDate
-               webInterface.getNotifications(getCurrentSone(freenetRequest.toadletContext)).sortedBy(Notification::getCreatedTime).run {
+               webInterface.getNotifications(getCurrentSone(request.toadletContext)).sortedBy(Notification::getCreatedTime).run {
                        templateContext["notifications"] = this
                        templateContext["notificationHash"] = this.hashCode()
                }
-               handleRequest(freenetRequest, templateContext)
+               handleRequest(request, templateContext)
+       }
+
+       open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+               handleRequest(freenetRequest.toSoneRequest(core, webInterface), templateContext)
        }
 
-       internal open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+       open fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
        }
 
-       override public fun getRedirectTarget(freenetRequest: FreenetRequest): String? {
-               if (requiresLogin && getCurrentSone(freenetRequest.toadletContext) == null) {
-                       val parameters = freenetRequest.httpRequest.parameterNames
-                                       .flatMap { name -> freenetRequest.httpRequest.getMultipleParam(name).map { name to it } }
+       override fun getRedirectTarget(request: FreenetRequest): String? {
+               if (requiresLogin && getCurrentSone(request.toadletContext) == null) {
+                       val parameters = request.httpRequest.parameterNames
+                                       .flatMap { name -> request.httpRequest.getMultipleParam(name).map { name to it } }
                                        .joinToString("&") { "${it.first.urlEncode}=${it.second.urlEncode}" }
                                        .emptyToNull
-                       return "login.html?target=${freenetRequest.httpRequest.path}${parameters?.let { ("?" + it).urlEncode } ?: ""}"
+                       return "login.html?target=${request.httpRequest.path}${parameters?.let { ("?" + it).urlEncode } ?: ""}"
                }
                return null
        }
 
        private val String.urlEncode: String get() = URLEncoder.encode(this, "UTF-8")
 
-       override fun isEnabled(toadletContext: ToadletContext) = when {
-               requiresLogin && getCurrentSone(toadletContext) == null -> false
-               core.preferences.requireFullAccess && !toadletContext.isAllowedFullAccess -> false
+       override fun isEnabled(toadletContext: ToadletContext) =
+                       isEnabled(SoneRequest(toadletContext.uri, Method.GET, HTTPRequestImpl(toadletContext.uri, "GET"), toadletContext, webInterface.l10n, webInterface.sessionManager, core, webInterface))
+
+       open fun isEnabled(soneRequest: SoneRequest) = when {
+               requiresLogin && getCurrentSone(soneRequest.toadletContext) == null -> false
+               core.preferences.requireFullAccess && !soneRequest.toadletContext.isAllowedFullAccess -> false
                else -> true
        }