♻️ Use SoneRequest instead of FreenetRequest

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

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
index a0fe7cb..78f981c 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
@@ -4,7 +4,7 @@ import freenet.clients.http.ToadletContext
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.isPOST
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.isPOST
 import net.pterodactylus.sone.web.WebInterface

-import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.sone.web.page.*

 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 import java.util.logging.Level
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 import java.util.logging.Level


@@ -19,28 +19,28 @@ class CreateSonePage @Inject constructor(template: Template, webInterface: WebIn
 
        private val logger = Logger.getLogger(CreateSonePage::class.java.name)
 
 
        private val logger = Logger.getLogger(CreateSonePage::class.java.name)
 

-       override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-               templateContext["sones"] = webInterface.core.localSones.sortedWith(Sone.NICE_NAME_COMPARATOR)
-               templateContext["identitiesWithoutSone"] = webInterface.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}".toLowerCase() }
-               if (freenetRequest.isPOST) {
-                       val identity = freenetRequest.httpRequest.getPartAsStringFailsafe("identity", 43)
-                       webInterface.core.identityManager.allOwnIdentities.firstOrNull { it.id == identity }?.let { ownIdentity ->
-                               val sone = webInterface.core.createSone(ownIdentity)
+       override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
+               templateContext["sones"] = soneRequest.core.localSones.sortedWith(Sone.NICE_NAME_COMPARATOR)
+               templateContext["identitiesWithoutSone"] = soneRequest.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}".toLowerCase() }
+               if (soneRequest.isPOST) {
+                       val identity = soneRequest.httpRequest.getPartAsStringFailsafe("identity", 43)
+                       soneRequest.core.identityManager.allOwnIdentities.firstOrNull { it.id == identity }?.let { ownIdentity ->
+                               val sone = soneRequest.core.createSone(ownIdentity)

                                if (sone == null) {
                                        logger.log(Level.SEVERE, "Could not create Sone for OwnIdentity: $ownIdentity")
                                }
                                if (sone == null) {
                                        logger.log(Level.SEVERE, "Could not create Sone for OwnIdentity: $ownIdentity")
                                }

-                               setCurrentSone(freenetRequest.toadletContext, sone)
+                               setCurrentSone(soneRequest.toadletContext, sone)

                                throw RedirectException("index.html")
                        }
                        templateContext["errorNoIdentity"] = true
                }
        }
 
                                throw RedirectException("index.html")
                        }
                        templateContext["errorNoIdentity"] = true
                }
        }
 

-       override fun isEnabled(toadletContext: ToadletContext) =
-                       if (webInterface.core.preferences.requireFullAccess && !toadletContext.isAllowedFullAccess) {
+       override fun isEnabled(soneRequest: SoneRequest) =
+                       if (soneRequest.core.preferences.requireFullAccess && !soneRequest.toadletContext.isAllowedFullAccess) {

                                false
                        } else {
                                false
                        } else {

-                               (getCurrentSone(toadletContext) == null) || (webInterface.core.localSones.size == 1)
+                               (getCurrentSone(soneRequest.toadletContext) == null) || (soneRequest.core.localSones.size == 1)

                        }
 
 }
                        }
 
 }