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

Replace unlike ajax page with Kotlin version
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.java
deleted file mode 100644
index a527b94..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Sone - UnlikeAjaxPage.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 net.pterodactylus.sone.data.Post;
-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 unlike a {@link Post}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class UnlikeAjaxPage extends LoggedInJsonPage {
-
-	/**
-	 * Creates a new “unlike post” AJAX page.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public UnlikeAjaxPage(WebInterface webInterface) {
-		super("unlike.ajax", webInterface);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Nonnull
-	@Override
-	protected JsonReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull FreenetRequest request) {
-		String type = request.getHttpRequest().getParam("type", null);
-		String id = request.getHttpRequest().getParam(type, null);
-		if ((id == null) || (id.length() == 0)) {
-			return createErrorJsonObject("invalid-" + type + "-id");
-		}
-		if ("post".equals(type)) {
-			currentSone.removeLikedPostId(id);
-			webInterface.getCore().touchConfiguration();
-		} else if ("reply".equals(type)) {
-			currentSone.removeLikedReplyId(id);
-			webInterface.getCore().touchConfiguration();
-		} else {
-			return createErrorJsonObject("invalid-type");
-		}
-		return createSuccessJsonObject();
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.kt
new file mode 100644
index 0000000..c4ec236
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.kt
@@ -0,0 +1,27 @@
+package net.pterodactylus.sone.web.ajax
+
+import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.utils.emptyToNull
+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 unlike a [net.pterodactylus.sone.data.Post].
+ */
+class UnlikeAjaxPage(webInterface: WebInterface) : LoggedInJsonPage("unlike.ajax", webInterface) {
+
+	override fun createJsonObject(currentSone: Sone, request: FreenetRequest) = when (request.parameters["type"]) {
+		"post" -> request.processEntity("post", currentSone::removeLikedPostId)
+		"reply" -> request.processEntity("reply", currentSone::removeLikedReplyId)
+		else -> createErrorJsonObject("invalid-type")
+	}
+
+	private fun FreenetRequest.processEntity(entity: String, likeRemover: (String) -> Unit) =
+			parameters[entity].emptyToNull
+					?.also(likeRemover)
+					?.also { webInterface.core.touchConfiguration() }
+					?.let { createSuccessJsonObject() }
+					?: createErrorJsonObject("invalid-$entity-id")
+
+}