From e845284d2f10cf6b0b405966d48938ef1fea0a38 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Sat, 9 Sep 2017 12:37:54 +0200
Subject: [PATCH] Replace follow Sone ajax page with Kotlin version

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
deleted file mode 100644
index 1ef8773..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Sone - FollowSoneAjaxPage.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 javax.annotation.Nonnull;
-
-import com.google.common.base.Optional;
-
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-
-/**
- * AJAX page that lets a Sone follow another Sone.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class FollowSoneAjaxPage extends LoggedInJsonPage {
-
-	/**
-	 * Creates a new “follow Sone” AJAX page.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public FollowSoneAjaxPage(WebInterface webInterface) {
-		super("followSone.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().followSone(currentSone, soneId);
-		webInterface.getCore().markSoneKnown(sone.get());
-		return createSuccessJsonObject();
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.kt
new file mode 100644
index 0000000..b37b48a
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.kt
@@ -0,0 +1,23 @@
+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 a Sone follow another Sone.
+ */
+class FollowSoneAjaxPage(webInterface: WebInterface) : LoggedInJsonPage("followSone.ajax", webInterface) {
+
+	override fun createJsonObject(currentSone: Sone, request: FreenetRequest) =
+			request.parameters["sone"]
+					.let(webInterface.core::getSone)
+					?.also { webInterface.core.followSone(currentSone, it.id) }
+					?.also(webInterface.core::markSoneKnown)
+					?.let { createSuccessJsonObject() }
+					?: createErrorJsonObject("invalid-sone-id")
+
+}
-- 
2.7.4