♻️ Move throwing redirect exception into method

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

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 6546bdc..be0e4c1 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
@@ -1,21 +1,21 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.main.*
-import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.utils.parameters
-import net.pterodactylus.sone.web.WebInterface
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
 import net.pterodactylus.sone.web.page.*
-import net.pterodactylus.util.template.Template
-import net.pterodactylus.util.template.TemplateContext
-import javax.inject.Inject
+import net.pterodactylus.util.template.*
+import javax.inject.*
 
 /**
  * Page that lets the user control the rescue mode for a Sone.
  */
 @MenuName("Rescue")
-class RescuePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
-               LoggedInPage("rescue.html", template, "Page.Rescue.Title", webInterface, loaders, templateRenderer) {
+@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(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                val soneRescuer = soneRequest.core.getSoneRescuer(currentSone)
@@ -29,7 +29,7 @@ class RescuePage @Inject constructor(template: Template, webInterface: WebInterf
                        if (soneRequest.parameters["fetch", 8] == "true") {
                                soneRescuer.startNextFetch()
                        }
-                       throw RedirectException("rescue.html")
+                       redirectTo("rescue.html")
                }
        }