From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 2 Sep 2017 08:41:21 +0000 (+0200)
Subject: Replace delete reply ajax page with Kotlin version
X-Git-Tag: 0.9.7^2~94
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=e36e66709507f77ca27641d882066f730d06c651

Replace delete reply ajax page with Kotlin version
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
deleted file mode 100644
index 7b2c3c9..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Sone - DeleteReplyAjaxPage.java - Copyright © 2010–2016 David Roden
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.web.ajax;
-
-import com.google.common.base.Optional;
-
-import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-
-/**
- * This AJAX page deletes a reply.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class DeleteReplyAjaxPage extends JsonPage {
-
-	/**
-	 * Creates a new AJAX page that deletes a reply.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public DeleteReplyAjaxPage(WebInterface webInterface) {
-		super("deleteReply.ajax", webInterface);
-	}
-
-	//
-	// JSONPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected JsonReturnObject createJsonObject(FreenetRequest request) {
-		String replyId = request.getHttpRequest().getParam("reply");
-		Optional<PostReply> reply = webInterface.getCore().getPostReply(replyId);
-		if (!reply.isPresent()) {
-			return createErrorJsonObject("invalid-reply-id");
-		}
-		if (!reply.get().getSone().isLocal()) {
-			return createErrorJsonObject("not-authorized");
-		}
-		webInterface.getCore().deleteReply(reply.get());
-		return createSuccessJsonObject();
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.kt
new file mode 100644
index 0000000..762bc8e
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.kt
@@ -0,0 +1,25 @@
+package net.pterodactylus.sone.web.ajax
+
+import net.pterodactylus.sone.utils.ifTrue
+import net.pterodactylus.sone.utils.let
+import net.pterodactylus.sone.utils.parameters
+import net.pterodactylus.sone.web.WebInterface
+import net.pterodactylus.sone.web.page.FreenetRequest
+
+/**
+ * This AJAX page deletes a reply.
+ */
+class DeleteReplyAjaxPage(webInterface: WebInterface) : JsonPage("deleteReply.ajax", webInterface) {
+
+	override fun createJsonObject(request: FreenetRequest) =
+			request.parameters["reply"]
+					.let(webInterface.core::getPostReply)
+					?.let { reply ->
+						reply.sone.isLocal.ifTrue {
+							createSuccessJsonObject().also {
+								webInterface.core.deleteReply(reply)
+							}
+						} ?: createErrorJsonObject("not-authorized")
+					} ?: createErrorJsonObject("invalid-reply-id")
+
+}