🔥 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 abc58f5..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
@@ -2,13 +2,12 @@ package net.pterodactylus.sone.web.pages
 
 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.*
 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
@@ -19,14 +18,15 @@ import java.net.URLEncoder
 open class SoneTemplatePage @JvmOverloads constructor(
                path: String,
                private val webInterface: WebInterface,
-               template: Template,
+               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)
@@ -40,10 +40,9 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
        open fun getPageTitle(soneRequest: SoneRequest) = pageTitle(soneRequest)
 
-       override public fun getStyleSheets() =
-                       listOf("css/sone.css")
+       override val styleSheets = listOf("css/sone.css")
 
-       override public fun getShortcutIcon() = "images/icon.png"
+       override val shortcutIcon = "images/icon.png"
 
        override public fun getAdditionalLinkNodes(request: FreenetRequest) =
                        listOf(mapOf(
@@ -92,7 +91,7 @@ open class SoneTemplatePage @JvmOverloads constructor(
        private val String.urlEncode: String get() = URLEncoder.encode(this, "UTF-8")
 
        override fun isEnabled(toadletContext: ToadletContext) =
-                       isEnabled(SoneRequest(toadletContext.uri, Method.GET, HTTPRequestImpl(toadletContext.uri, "GET"), toadletContext, webInterface.l10n, core, webInterface))
+                       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