From 122029d3393faa18eeca42487af59773da90eafd Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 4 Jun 2017 12:19:53 +0200 Subject: [PATCH] Replace untrust page with Kotlin version --- .../pterodactylus/sone/web/pages/UntrustPage.java | 72 ---------------------- .../pterodactylus/sone/web/pages/UntrustPage.kt | 29 +++++++++ 2 files changed, 29 insertions(+), 72 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/pages/UntrustPage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/pages/UntrustPage.java b/src/main/java/net/pterodactylus/sone/web/pages/UntrustPage.java deleted file mode 100644 index de0b086..0000000 --- a/src/main/java/net/pterodactylus/sone/web/pages/UntrustPage.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Sone - UntrustPage.java - Copyright © 2011–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.pages; - -import com.google.common.base.Optional; - -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; -import net.pterodactylus.util.template.Template; -import net.pterodactylus.util.template.TemplateContext; -import net.pterodactylus.util.web.Method; - -/** - * Page that lets the user untrust another Sone. This will remove all trust - * assignments for an identity. - * - * @see Core#untrustSone(Sone, Sone) - * @author David ‘Bombe’ Roden - */ -public class UntrustPage extends SoneTemplatePage { - - /** - * Creates a new “untrust Sone” page. - * - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public UntrustPage(Template template, WebInterface webInterface) { - super("untrust.html", template, "Page.Untrust.Title", webInterface, true); - } - - // - // SONETEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - if (request.getMethod() == Method.POST) { - String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); - String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44); - Sone currentSone = getCurrentSone(request.getToadletContext()); - Optional sone = webInterface.getCore().getSone(identity); - if (sone.isPresent()) { - webInterface.getCore().untrustSone(currentSone, sone.get()); - } - throw new RedirectException(returnPage); - } - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt new file mode 100644 index 0000000..fb3f281 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt @@ -0,0 +1,29 @@ +package net.pterodactylus.sone.web.pages + +import net.pterodactylus.sone.utils.also +import net.pterodactylus.sone.utils.isPOST +import net.pterodactylus.sone.utils.parameters +import net.pterodactylus.sone.web.WebInterface +import net.pterodactylus.sone.web.page.FreenetRequest +import net.pterodactylus.util.template.Template +import net.pterodactylus.util.template.TemplateContext + +/** + * Page that lets the user untrust another Sone. This will remove all trust + * assignments for an identity. + */ +class UntrustPage(template: Template, webInterface: WebInterface): + SoneTemplatePage("untrust.html", template, "Page.Untrust.Title", webInterface, true) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + if (request.isPOST) { + getCurrentSone(request.toadletContext)!!.also { currentSone -> + request.parameters["sone", 44] + .let(webInterface.core::getSone) + .also { webInterface.core.untrustSone(currentSone, it) } + } + throw RedirectException(request.parameters["returnPage", 256]) + } + } + +} -- 2.7.4