🔀 Merge branch 'release/v82'

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

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
index af62489..e6fbce8 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
@@ -1,34 +1,35 @@
 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.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.*
 
 /**
  * This page lets the user delete a reply.
  */
-class DeleteReplyPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
-               LoggedInPage("deleteReply.html", template, "Page.DeleteReply.Title", webInterface, loaders) {
+@TemplatePath("/templates/deleteReply.html")
+@ToadletPath("deleteReply.html")
+class DeleteReplyPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+               LoggedInPage("Page.DeleteReply.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {
                        val replyId = soneRequest.httpRequest.getPartAsStringFailsafe("reply", 36)
-                       val reply = soneRequest.core.getPostReply(replyId) ?: throw RedirectException("noPermission.html")
+                       val reply = soneRequest.core.getPostReply(replyId) ?: redirectTo("noPermission.html")
                        if (!reply.sone.isLocal) {
-                               throw RedirectException("noPermission.html")
+                               redirectTo("noPermission.html")
                        }
                        val returnPage = soneRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256)
                        if (soneRequest.httpRequest.isPartSet("confirmDelete")) {
                                soneRequest.core.deleteReply(reply)
-                               throw RedirectException(returnPage)
+                               redirectTo(returnPage)
                        }
                        if (soneRequest.httpRequest.isPartSet("abortDelete")) {
-                               throw RedirectException(returnPage)
+                               redirectTo(returnPage)
                        }
                        templateContext["reply"] = replyId
                        templateContext["returnPage"] = returnPage