🔥 Remove templates from FreenetTemplatePages

[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 b4178cc..3df343a 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,16 +1,15 @@
 package net.pterodactylus.sone.web.pages
 
-import freenet.clients.http.ToadletContext
+import freenet.clients.http.*
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.main.SonePlugin
+import net.pterodactylus.sone.main.*
 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.sone.web.page.*
 import net.pterodactylus.util.notify.Notification
-import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
+import net.pterodactylus.util.web.*
 import java.net.URLEncoder
 
 /**
@@ -18,15 +17,16 @@ import java.net.URLEncoder
  */
 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(path, 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,12 +36,13 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
        fun requiresLogin() = requiresLogin
 
-       override public fun getPageTitle(freenetRequest: FreenetRequest) = pageTitle(freenetRequest)
+       override public fun getPageTitle(freenetRequest: FreenetRequest) = getPageTitle(freenetRequest.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 val shortcutIcon = "images/icon.png"
 
        override public fun getAdditionalLinkNodes(request: FreenetRequest) =
                        listOf(mapOf(
@@ -69,7 +70,11 @@ open class SoneTemplatePage @JvmOverloads constructor(
                handleRequest(freenetRequest, templateContext)
        }
 
-       internal open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+       open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+               handleRequest(freenetRequest.toSoneRequest(core, webInterface), templateContext)
+       }
+
+       open fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
        }
 
        override public fun getRedirectTarget(freenetRequest: FreenetRequest): String? {
@@ -85,9 +90,12 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
        private val String.urlEncode: String get() = URLEncoder.encode(this, "UTF-8")
 
-       override fun isEnabled(toadletContext: ToadletContext) = when {
-               requiresLogin && getCurrentSone(toadletContext) == null -> false
-               core.preferences.isRequireFullAccess && !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
        }