♻️ Add SoneRequest for Sone-specific request values

[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 3f04236..4290c3a 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -6,8 +6,7 @@ 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.sone.web.page.*
 import net.pterodactylus.util.notify.Notification
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
@@ -16,21 +15,15 @@ import java.net.URLEncoder
 /**
  * Base page for the Sone web interface.
  */
-open class SoneTemplatePage(
+open class SoneTemplatePage @JvmOverloads constructor(
                path: String,
                protected val webInterface: WebInterface,
                template: Template,
                private val pageTitleKey: String? = null,
-               private val requiresLogin: Boolean = true
+               private val requiresLogin: Boolean = false,
+               private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.l10n::getString) ?: "" }
 ) : FreenetTemplatePage(path, webInterface.templateContextFactory, template, "noPermission.html") {
 
-       @JvmOverloads
-       constructor(path: String, template: Template, pageTitleKey: String?, webInterface: WebInterface, requireLogin: Boolean = false) :
-                       this(path, webInterface, template, pageTitleKey, requireLogin)
-
-       constructor(path: String, template: Template, webInterface: WebInterface, requireLogin: Boolean = true) :
-                       this(path, webInterface, template, null, requireLogin)
-
        private val core = webInterface.core
        protected val sessionProvider: SessionProvider = webInterface
 
@@ -42,8 +35,7 @@ open class SoneTemplatePage(
 
        fun requiresLogin() = requiresLogin
 
-       override public fun getPageTitle(freenetRequest: FreenetRequest) =
-                       pageTitleKey?.let(webInterface.l10n::getString) ?: ""
+       override public fun getPageTitle(freenetRequest: FreenetRequest) = pageTitle(freenetRequest)
 
        override public fun getStyleSheets() =
                        listOf("css/sone.css")
@@ -77,6 +69,10 @@ open class SoneTemplatePage(
        }
 
        internal open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+               handleRequest(freenetRequest.toSoneRequest(core), templateContext)
+       }
+
+       open fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
        }
 
        override public fun getRedirectTarget(freenetRequest: FreenetRequest): String? {
@@ -94,7 +90,7 @@ open class SoneTemplatePage(
 
        override fun isEnabled(toadletContext: ToadletContext) = when {
                requiresLogin && getCurrentSone(toadletContext) == null -> false
-               core.preferences.isRequireFullAccess && !toadletContext.isAllowedFullAccess -> false
+               core.preferences.requireFullAccess && !toadletContext.isAllowedFullAccess -> false
                else -> true
        }