From 8419f82ea9a6da6f4c8c564e13a2614be89ae3df Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 2 Oct 2017 15:59:35 +0200 Subject: [PATCH] Replace unlock Sone ajax page with Kotlin version --- .../sone/web/ajax/UnlockSoneAjaxPage.java | 64 ---------------------- .../sone/web/ajax/UnlockSoneAjaxPage.kt | 22 ++++++++ 2 files changed, 22 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java deleted file mode 100644 index bf88371..0000000 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Sone - UnlockSoneAjaxPage.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 . - */ - -package net.pterodactylus.sone.web.ajax; - -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; - -/** - * Lets the user {@link Core#unlockSone(Sone) unlock} a {@link Sone}. - * - * @author David ‘Bombe’ Roden - */ -public class UnlockSoneAjaxPage extends JsonPage { - - /** - * Creates a new “unlock Sone” AJAX handler. - * - * @param webInterface - * The Sone web interface - */ - public UnlockSoneAjaxPage(WebInterface webInterface) { - super("unlockSone.ajax", webInterface); - } - - /** - * {@inheritDoc} - */ - @Override - protected JsonReturnObject createJsonObject(FreenetRequest request) { - String soneId = request.getHttpRequest().getParam("sone"); - Sone sone = webInterface.getCore().getLocalSone(soneId); - if (sone == null) { - return createErrorJsonObject("invalid-sone-id"); - } - webInterface.getCore().unlockSone(sone); - return createSuccessJsonObject(); - } - - /** - * {@inheritDoc} - */ - @Override - protected boolean requiresLogin() { - return false; - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.kt new file mode 100644 index 0000000..2dffbed --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.kt @@ -0,0 +1,22 @@ +package net.pterodactylus.sone.web.ajax + +import net.pterodactylus.sone.utils.parameters +import net.pterodactylus.sone.web.WebInterface +import net.pterodactylus.sone.web.page.FreenetRequest + +/** + * Lets the user [unlock][net.pterodactylus.sone.core.Core.unlockSone] a [Sone][net.pterodactylus.sone.data.Sone]. + */ +class UnlockSoneAjaxPage(webInterface: WebInterface) : JsonPage("unlockSone.ajax", webInterface) { + + override fun requiresLogin() = false + + override fun createJsonObject(request: FreenetRequest) = + request.parameters["sone"] + ?.let(webInterface.core::getLocalSone) + ?.also(webInterface.core::unlockSone) + ?.also { webInterface.core.touchConfiguration() } + ?.let { createSuccessJsonObject() } + ?: createErrorJsonObject("invalid-sone-id") + +} -- 2.7.4