From cf4ccc7587da36e4a6ba6aa7c04394280b35e271 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Mon, 24 Jul 2017 07:04:40 +0200
Subject: [PATCH] Replace create post ajax page with Kotlin version

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
deleted file mode 100644
index bf82328..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Sone - CreatePostAjaxPage.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 net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.text.TextFilter;
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-
-import com.google.common.base.Optional;
-
-/**
- * AJAX handler that creates a new post.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class CreatePostAjaxPage extends JsonPage {
-
-	/**
-	 * Creates a new “create post” AJAX handler.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public CreatePostAjaxPage(WebInterface webInterface) {
-		super("createPost.ajax", webInterface);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected JsonReturnObject createJsonObject(FreenetRequest request) {
-		Sone sone = getCurrentSone(request.getToadletContext());
-		if (sone == null) {
-			return createErrorJsonObject("auth-required");
-		}
-		String recipientId = request.getHttpRequest().getParam("recipient");
-		Optional<Sone> recipient = webInterface.getCore().getSone(recipientId);
-		String senderId = request.getHttpRequest().getParam("sender");
-		Sone sender = webInterface.getCore().getLocalSone(senderId);
-		if (sender == null) {
-			sender = sone;
-		}
-		String text = request.getHttpRequest().getParam("text");
-		if ((text == null) || (text.trim().length() == 0)) {
-			return createErrorJsonObject("text-required");
-		}
-		text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
-		Post newPost = webInterface.getCore().createPost(sender, recipient, text);
-		return createSuccessJsonObject().put("postId", newPost.getId()).put("sone", sender.getId()).put("recipient", newPost.getRecipientId().orNull());
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt
new file mode 100644
index 0000000..c9bcf48
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt
@@ -0,0 +1,34 @@
+package net.pterodactylus.sone.web.ajax
+
+import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.text.TextFilter
+import net.pterodactylus.sone.utils.emptyToNull
+import net.pterodactylus.sone.utils.headers
+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 handler that creates a new post.
+ */
+class CreatePostAjaxPage(webInterface: WebInterface) : JsonPage("createPost.ajax", webInterface) {
+
+	override fun createJsonObject(request: FreenetRequest) =
+			getCurrentSone(request.toadletContext)?.let { sone ->
+				request.parameters["text"].emptyToNull
+						?.let { TextFilter.filter(request.headers["Host"], it) }
+						?.let { text ->
+							val sender = request.parameters["sender"].emptyToNull?.let(webInterface.core::getSone)?.orNull() ?: sone
+							val recipient = request.parameters["recipient"].let(webInterface.core::getSone)
+							webInterface.core.createPost(sender, recipient, text).let { post ->
+								createSuccessJsonObject().apply {
+									put("postId", post.id)
+									put("sone", sender.id)
+									put("recipient", recipient.let(Sone::getId))
+								}
+							}
+						} ?: createErrorJsonObject("text-required")
+			} ?: createErrorJsonObject("auth-required")
+
+}
-- 
2.7.4