From e9bc5900da836a751d3af427fef61e84e9fb3690 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Thu, 14 Sep 2017 21:52:52 +0200 Subject: [PATCH] Replace lock Sone ajax page with Kotlin version --- .../sone/web/ajax/LockSoneAjaxPage.java | 64 ---------------------- .../sone/web/ajax/LockSoneAjaxPage.kt | 21 +++++++ 2 files changed, 21 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java deleted file mode 100644 index 7298bae..0000000 --- a/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Sone - LockSoneAjaxPage.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#lockSone(Sone) lock} a {@link Sone}. - * - * @author David ‘Bombe’ Roden - */ -public class LockSoneAjaxPage extends JsonPage { - - /** - * Creates a new “lock Sone” AJAX handler. - * - * @param webInterface - * The Sone web interface - */ - public LockSoneAjaxPage(WebInterface webInterface) { - super("lockSone.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().lockSone(sone); - return createSuccessJsonObject(); - } - - /** - * {@inheritDoc} - */ - @Override - protected boolean requiresLogin() { - return false; - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.kt new file mode 100644 index 0000000..add66b5 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.kt @@ -0,0 +1,21 @@ +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 [lock][net.pterodactylus.sone.core.Core.lockSone] a [Sone][net.pterodactylus.sone.data.Sone]. + */ +class LockSoneAjaxPage(webInterface: WebInterface) : JsonPage("lockSone.ajax", webInterface) { + + override fun requiresLogin() = false + + override fun createJsonObject(request: FreenetRequest) = + request.parameters["sone"] + .let(webInterface.core::getLocalSone) + ?.let(webInterface.core::lockSone) + ?.let { createSuccessJsonObject() } + ?: createErrorJsonObject("invalid-sone-id") + +} -- 2.7.4