From 5d6bab3766964d593324f1855a0b210580473e59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 24 Mar 2017 20:10:03 +0100 Subject: [PATCH] Replace distrust page with Kotlin version --- .../net/pterodactylus/sone/web/DistrustPage.java | 71 ---------------------- .../net/pterodactylus/sone/web/DistrustPage.kt | 25 ++++++++ .../net/pterodactylus/sone/web/DistrustPageTest.kt | 2 +- 3 files changed, 26 insertions(+), 72 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/DistrustPage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/DistrustPage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/DistrustPage.java b/src/main/java/net/pterodactylus/sone/web/DistrustPage.java deleted file mode 100644 index 50e3efb..0000000 --- a/src/main/java/net/pterodactylus/sone/web/DistrustPage.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Sone - DistrustPage.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; - -import com.google.common.base.Optional; - -import net.pterodactylus.sone.core.Core; -import net.pterodactylus.sone.data.Sone; -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 distrust another Sone. This will assign a - * configurable (negative) amount of trust to an identity. - * - * @see Core#distrustSone(Sone, Sone) - * @author David ‘Bombe’ Roden - */ -public class DistrustPage extends SoneTemplatePage { - - /** - * Creates a new “distrust Sone” page. - * - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public DistrustPage(Template template, WebInterface webInterface) { - super("distrust.html", template, "Page.Distrust.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().distrustSone(currentSone, sone.get()); - } - throw new RedirectException(returnPage); - } - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/DistrustPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/DistrustPage.kt new file mode 100644 index 0000000..5ef12d1 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/DistrustPage.kt @@ -0,0 +1,25 @@ +package net.pterodactylus.sone.web + +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.POST + +/** + * Page that lets the user distrust another Sone. This will assign a + * configurable (negative) amount of trust to an identity. + * + * @see net.pterodactylus.sone.core.Core#distrustSone(Sone, Sone) + */ +class DistrustPage(template: Template, webInterface: WebInterface): + SoneTemplatePage("distrust.html", template, "Page.Distrust.Title", webInterface, true) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + if (request.method == POST) { + val sone = webInterface.core.getSone(request.httpRequest.getPartAsStringFailsafe("sone", 44)).orNull() + sone?.run { webInterface.core.distrustSone(getCurrentSone(request.toadletContext), this) } + throw RedirectException(request.httpRequest.getPartAsStringFailsafe("returnPage", 256)) + } + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt index 3057a63..8346a7f 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt @@ -38,7 +38,7 @@ class DistrustPageTest: WebPageTest() { @Test fun `get request does not redirect`() { request("", GET) - page.handleRequest(freenetRequest, templateContext) + page.processTemplate(freenetRequest, templateContext) } @Test -- 2.7.4