X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FLoginPage.kt;h=624432578c4c1f3074bb667e7f6e9e69c0ac55d4;hp=1c3a02cf60b856eb49e6e10b3a9beb5870c879df;hb=HEAD;hpb=a76956e389fcfe6282ad4ca7156bbf76327bb0c0

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
index 1c3a02c..6244325 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
@@ -13,8 +13,9 @@ import javax.inject.*
  */
 @MenuName("Login")
 @TemplatePath("/templates/login.html")
-class LoginPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
-		SoneTemplatePage("login.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.Login.Title") {
+@ToadletPath("login.html")
+class LoginPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Login.Title") {
 
 	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
 		if (soneRequest.isPOST) {
@@ -22,15 +23,15 @@ class LoginPage @Inject constructor(webInterface: WebInterface, loaders: Loaders
 			soneRequest.core.getLocalSone(soneId)?.let { sone ->
 				setCurrentSone(soneRequest.toadletContext, sone)
 				val target = soneRequest.httpRequest.getParam("target").emptyToNull ?: "index.html"
-				throw RedirectException(target)
+				redirectTo(target)
 			}
 		}
-		templateContext["sones"] = soneRequest.core.localSones.sortedWith(Sone.NICE_NAME_COMPARATOR)
+		templateContext["sones"] = soneRequest.core.localSones.sortedWith(niceNameComparator)
 		templateContext["identitiesWithoutSone"] = soneRequest.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}" }
 	}
 
-	override fun getRedirectTarget(freenetRequest: FreenetRequest) =
-			getCurrentSone(freenetRequest.toadletContext)?.let { "index.html" }
+	override fun getRedirectTarget(request: FreenetRequest) =
+			getCurrentSone(request.toadletContext)?.let { "index.html" }
 
 	override fun isEnabled(soneRequest: SoneRequest) = when {
 		soneRequest.core.preferences.requireFullAccess && !soneRequest.toadletContext.isAllowedFullAccess -> false