From e041747229cbcb4acba7d76257bc50d76ff7a7a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 4 Jun 2017 11:35:40 +0200 Subject: [PATCH] Replace unfollow Sone page with Kotlin version --- .../sone/web/pages/UnfollowSonePage.java | 64 ---------------------- .../sone/web/pages/UnfollowSonePage.kt | 27 +++++++++ 2 files changed, 27 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/pages/UnfollowSonePage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/pages/UnfollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/pages/UnfollowSonePage.java deleted file mode 100644 index ec377e2..0000000 --- a/src/main/java/net/pterodactylus/sone/web/pages/UnfollowSonePage.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Sone - UnfollowSonePage.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.pages; - -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; - -/** - * This page lets the user unfollow another Sone. - * - * @author David ‘Bombe’ Roden - */ -public class UnfollowSonePage extends SoneTemplatePage { - - /** - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public UnfollowSonePage(Template template, WebInterface webInterface) { - super("unfollowSone.html", template, "Page.UnfollowSone.Title", webInterface, true); - } - - // - // TEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - if (request.getMethod() == Method.POST) { - String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); - Sone currentSone = getCurrentSone(request.getToadletContext()); - String soneIds = request.getHttpRequest().getPartAsStringFailsafe("sone", 2000); - for (String soneId : soneIds.split("[ ,]+")) { - webInterface.getCore().unfollowSone(currentSone, soneId); - } - throw new RedirectException(returnPage); - } - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt new file mode 100644 index 0000000..3b299d2 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt @@ -0,0 +1,27 @@ +package net.pterodactylus.sone.web.pages + +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 +import java.util.regex.Pattern + +/** + * This page lets the user unfollow another Sone. + */ +class UnfollowSonePage(template: Template, webInterface: WebInterface): + SoneTemplatePage("unfollowSone.html", template, "Page.UnfollowSone.Title", webInterface, true) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + if (request.isPOST) { + getCurrentSone(request.toadletContext)!!.also { currentSone -> + request.parameters["sone"]!!.split(Regex("[ ,]+")) + .forEach { webInterface.core.unfollowSone(currentSone, it) } + } + throw RedirectException(request.parameters["returnPage", 256]) + } + } + +} -- 2.7.4