From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 2 Oct 2017 14:14:18 +0000 (+0200)
Subject: Replace untrust ajax page with Kotlin version
X-Git-Tag: 0.9.7^2~31
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=bffa2f59940c78942d57897971702d03e10cdc20;p=Sone.git

Replace untrust ajax page with Kotlin version
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
deleted file mode 100644
index 5ba6693..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Sone - UntrustAjaxPage.java - Copyright © 2011–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 javax.annotation.Nonnull;
-
-import com.google.common.base.Optional;
-
-import net.pterodactylus.sone.core.Core;
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-
-/**
- * AJAX page that lets the user untrust a Sone.
- *
- * @see Core#untrustSone(Sone, Sone)
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class UntrustAjaxPage extends LoggedInJsonPage {
-
-	/**
-	 * Creates a new “untrust Sone” AJAX handler.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public UntrustAjaxPage(WebInterface webInterface) {
-		super("untrustSone.ajax", webInterface);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Nonnull
-	@Override
-	protected JsonReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull FreenetRequest request) {
-		String soneId = request.getHttpRequest().getParam("sone");
-		Optional<Sone> sone = webInterface.getCore().getSone(soneId);
-		if (!sone.isPresent()) {
-			return createErrorJsonObject("invalid-sone-id");
-		}
-		webInterface.getCore().untrustSone(currentSone, sone.get());
-		return createSuccessJsonObject().put("trustValue", (String) null);
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.kt
new file mode 100644
index 0000000..e622554
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.kt
@@ -0,0 +1,22 @@
+package net.pterodactylus.sone.web.ajax
+
+import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.utils.also
+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
+
+/**
+ * AJAX page that lets the user [untrust][net.pterodactylus.sone.core.Core.untrustSone] a [Sone].
+ */
+class UntrustAjaxPage(webInterface: WebInterface) : LoggedInJsonPage("untrustSone.ajax", webInterface) {
+
+	override fun createJsonObject(currentSone: Sone, request: FreenetRequest) =
+			request.parameters["sone"]
+					?.let(webInterface.core::getSone)
+					?.also { webInterface.core.untrustSone(currentSone, it) }
+					?.let { createSuccessJsonObject() }
+					?: createErrorJsonObject("invalid-sone-id")
+
+}