From be0349bd60c00fb7bc32d5b6d62270e1a46abdda Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Tue, 5 Sep 2017 11:40:50 +0200
Subject: [PATCH] Replace distrust ajax page with Kotlin version

---
 .../sone/web/ajax/DistrustAjaxPage.java            | 63 ----------------------
 .../sone/web/ajax/DistrustAjaxPage.kt              | 27 ++++++++++
 2 files changed, 27 insertions(+), 63 deletions(-)
 delete mode 100644 src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
 create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.kt

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
deleted file mode 100644
index 26a1207..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Sone - DistrustAjaxPage.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 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 distrust a Sone.
- *
- * @see Core#distrustSone(Sone, Sone)
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class DistrustAjaxPage extends JsonPage {
-
-	/**
-	 * Creates a new “distrust Sone” AJAX handler.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public DistrustAjaxPage(WebInterface webInterface) {
-		super("distrustSone.ajax", webInterface);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected JsonReturnObject createJsonObject(FreenetRequest request) {
-		Sone currentSone = getCurrentSone(request.getToadletContext(), false);
-		if (currentSone == null) {
-			return createErrorJsonObject("auth-required");
-		}
-		String soneId = request.getHttpRequest().getParam("sone");
-		Optional<Sone> sone = webInterface.getCore().getSone(soneId);
-		if (!sone.isPresent()) {
-			return createErrorJsonObject("invalid-sone-id");
-		}
-		webInterface.getCore().distrustSone(currentSone, sone.get());
-		return createSuccessJsonObject().put("trustValue", webInterface.getCore().getPreferences().getNegativeTrust());
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.kt
new file mode 100644
index 0000000..0c56341
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.kt
@@ -0,0 +1,27 @@
+package net.pterodactylus.sone.web.ajax
+
+import net.pterodactylus.sone.core.Core
+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 distrust a Sone.
+ *
+ * @see Core.distrustSone(Sone, Sone)
+ */
+class DistrustAjaxPage(webInterface: WebInterface) : JsonPage("distrustSone.ajax", webInterface) {
+
+	override fun createJsonObject(request: FreenetRequest) =
+			request.parameters["sone"]
+					.let(webInterface.core::getSone)
+					?.let { sone ->
+						createSuccessJsonObject()
+								.put("trustValue", webInterface.core.preferences.negativeTrust)
+								.also {
+									webInterface.core.distrustSone(getCurrentSone(request.toadletContext), sone)
+								}
+					} ?: createErrorJsonObject("invalid-sone-id")
+
+}
-- 
2.7.4