♻️ Move throwing redirect exception into method

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

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt
index 055d580..5443d28 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt
@@ -13,14 +13,15 @@ import javax.inject.*
 /**
  * Page that lets the user edit title and description of an {@link Image}.
  */
+@ToadletPath("editImage.html")
 class EditImagePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("editImage.html", "Page.EditImage.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.EditImage.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {
-                       val image = soneRequest.core.getImage(soneRequest.httpRequest.getPartAsStringFailsafe("image", 36)) ?: throw RedirectException("invalid.html")
+                       val image = soneRequest.core.getImage(soneRequest.httpRequest.getPartAsStringFailsafe("image", 36)) ?: redirectTo("invalid.html")
                        if (!image.sone.isLocal) {
-                               throw RedirectException("noPermission.html")
+                               redirectTo("noPermission.html")
                        }
                        soneRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256).let { returnPage ->
                                if (soneRequest.httpRequest.getPartAsStringFailsafe("moveLeft", 4) == "true") {
@@ -37,10 +38,10 @@ class EditImagePage @Inject constructor(webInterface: WebInterface, loaders: Loa
                                                                .update()
                                                soneRequest.core.touchConfiguration()
                                        } catch (e: ImageTitleMustNotBeEmpty) {
-                                               throw RedirectException("emptyImageTitle.html")
+                                               redirectTo("emptyImageTitle.html")
                                        }
                                }
-                               throw RedirectException(returnPage)
+                               redirectTo(returnPage)
                        }
                }
        }