X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FRescuePage.kt;h=b93d09a8df773c7d747b367ea6001ad9c1a78053;hb=e9e1d2c56b52798136ff8f7a6f8c94257226d472;hp=1061a1089a3da9c9be3567324ded8c6820013d47;hpb=6d51a9996446ad0c1cbf5c36eb2802c35876c18e;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
index 1061a10..b93d09a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
@@ -1,33 +1,30 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.utils.parameters
-import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.util.template.Template
-import net.pterodactylus.util.template.TemplateContext
-import javax.inject.Inject
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.template.*
+import javax.inject.*
 
 /**
  * Page that lets the user control the rescue mode for a Sone.
  */
-class RescuePage @Inject constructor(template: Template, webInterface: WebInterface):
-		LoggedInPage("rescue.html", template, "Page.Rescue.Title", webInterface) {
+@MenuName("Rescue")
+@TemplatePath("/templates/rescue.html")
+@ToadletPath("rescue.html")
+class RescuePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		LoggedInPage("Page.Rescue.Title", webInterface, loaders, templateRenderer) {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
-		val soneRescuer = webInterface.core.getSoneRescuer(currentSone)
+	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+		val soneRescuer = soneRequest.core.getSoneRescuer(currentSone)
 		templateContext["soneRescuer"] = soneRescuer
-		if (freenetRequest.isPOST) {
-			freenetRequest.parameters["edition", 9]?.toIntOrNull()?.also {
-				if (it > -1) {
-					soneRescuer.setEdition(it.toLong())
-				}
-			}
-			if (freenetRequest.parameters["fetch", 8] == "true") {
+		if (soneRequest.isPOST) {
+			if (soneRequest.parameters["fetch", 8] == "true") {
 				soneRescuer.startNextFetch()
 			}
-			throw RedirectException("rescue.html")
+			redirectTo("rescue.html")
 		}
 	}