Return a nullable PostReply instead of an Optional

[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 0b922b0..ddaaf5e 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,7 +1,6 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.template.Template
@@ -13,27 +12,27 @@ import net.pterodactylus.util.template.TemplateContext
 class DeleteReplyPage(template: Template, webInterface: WebInterface):
                SoneTemplatePage("deleteReply.html", template, "Page.DeleteReply.Title", webInterface, true) {
 
-       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-               if (request.isPOST) {
-                       val replyId = request.httpRequest.getPartAsStringFailsafe("reply", 36)
-                       val reply = webInterface.core.getPostReply(replyId).orNull() ?: throw RedirectException("noPermission.html")
+       override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+               if (freenetRequest.isPOST) {
+                       val replyId = freenetRequest.httpRequest.getPartAsStringFailsafe("reply", 36)
+                       val reply = webInterface.core.getPostReply(replyId) ?: throw RedirectException("noPermission.html")
                        if (!reply.sone.isLocal) {
                                throw RedirectException("noPermission.html")
                        }
-                       val returnPage = request.httpRequest.getPartAsStringFailsafe("returnPage", 256)
-                       if (request.httpRequest.isPartSet("confirmDelete")) {
+                       val returnPage = freenetRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256)
+                       if (freenetRequest.httpRequest.isPartSet("confirmDelete")) {
                                webInterface.core.deleteReply(reply)
                                throw RedirectException(returnPage)
                        }
-                       if (request.httpRequest.isPartSet("abortDelete")) {
+                       if (freenetRequest.httpRequest.isPartSet("abortDelete")) {
                                throw RedirectException(returnPage)
                        }
                        templateContext["reply"] = replyId
                        templateContext["returnPage"] = returnPage
                        return
                }
-               templateContext["reply"] = request.httpRequest.getParam("reply")
-               templateContext["returnPage"] = request.httpRequest.getParam("returnPage")
+               templateContext["reply"] = freenetRequest.httpRequest.getParam("reply")
+               templateContext["returnPage"] = freenetRequest.httpRequest.getParam("returnPage")
        }
 
 }