X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FCreateSonePage.kt;h=78f981c7ca8f960e2658d8006251f8e5629b5619;hp=a0fe7cb0a509127199da175aebd0ce561e7483e0;hb=cd72add62ab407336b471d4b7cda8e33dd2df5c6;hpb=acf40290db822d7cbdaed590850f692953f51ac1

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
--- 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.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
@@ -19,28 +19,28 @@ class CreateSonePage @Inject constructor(template: Template, webInterface: WebIn
 
 	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")
 				}
-				setCurrentSone(freenetRequest.toadletContext, sone)
+				setCurrentSone(soneRequest.toadletContext, sone)
 				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 {
-				(getCurrentSone(toadletContext) == null) || (webInterface.core.localSones.size == 1)
+				(getCurrentSone(soneRequest.toadletContext) == null) || (soneRequest.core.localSones.size == 1)
 			}
 
 }