From 6105b12e4a61c270c859047866495fba2c718ee2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 14 Feb 2017 21:56:45 +0100 Subject: [PATCH] Replace delete post page with Kotlin version --- .../net/pterodactylus/sone/web/DeletePostPage.java | 83 ---------------------- .../net/pterodactylus/sone/web/DeletePostPage.kt | 32 +++++++++ .../pterodactylus/sone/web/DeletePostPageTest.kt | 10 +++ 3 files changed, 42 insertions(+), 83 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/DeletePostPage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/DeletePostPage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java b/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java deleted file mode 100644 index 9079dce..0000000 --- a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Sone - DeletePostPage.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; - -import com.google.common.base.Optional; - -import net.pterodactylus.sone.data.Post; -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; - -/** - * Lets the user delete a post they made. - * - * @author David ‘Bombe’ Roden - */ -public class DeletePostPage extends SoneTemplatePage { - - /** - * Creates a new “delete post” page. - * - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public DeletePostPage(Template template, WebInterface webInterface) { - super("deletePost.html", template, "Page.DeletePost.Title", webInterface, true); - } - - // - // TEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - if (request.getMethod() == Method.GET) { - String postId = request.getHttpRequest().getParam("post"); - String returnPage = request.getHttpRequest().getParam("returnPage"); - Optional post = webInterface.getCore().getPost(postId); - if (!post.isPresent()) { - throw new RedirectException("noPermission.html"); - } - templateContext.set("post", post.get()); - templateContext.set("returnPage", returnPage); - } else if (request.getMethod() == Method.POST) { - String postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36); - String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); - Optional post = webInterface.getCore().getPost(postId); - if (!post.isPresent() || !post.get().getSone().isLocal()) { - throw new RedirectException("noPermission.html"); - } - if (request.getHttpRequest().isPartSet("confirmDelete")) { - webInterface.getCore().deletePost(post.get()); - throw new RedirectException(returnPage); - } else if (request.getHttpRequest().isPartSet("abortDelete")) { - throw new RedirectException(returnPage); - } - templateContext.set("post", post.get()); - templateContext.set("returnPage", returnPage); - } - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/DeletePostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/DeletePostPage.kt new file mode 100644 index 0000000..40923d3 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/DeletePostPage.kt @@ -0,0 +1,32 @@ +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 + +/** + * Lets the user delete a post they made. + */ +class DeletePostPage(template: Template, webInterface: WebInterface): + SoneTemplatePage("deletePost.html", template, "Page.DeletePost.Title", webInterface, true) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + val post = webInterface.core.getPost(request.httpRequest.getPartAsStringFailsafe("post", 36)).orNull() ?: throw RedirectException("noPermission.html") + val returnPage = request.httpRequest.getPartAsStringFailsafe("returnPage", 256) + if (request.method == POST) { + if (!post.sone.isLocal) { + throw RedirectException("noPermission.html") + } + if (request.httpRequest.isPartSet("confirmDelete")) { + webInterface.core.deletePost(post) + throw RedirectException(returnPage) + } else if (request.httpRequest.isPartSet("abortDelete")) { + throw RedirectException(returnPage) + } + } + templateContext["post"] = post + templateContext["returnPage"] = returnPage + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt index baccdfc..ab7851a 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt @@ -32,6 +32,16 @@ class DeletePostPageTest : WebPageTest() { } @Test + fun `page returns correct path`() { + assertThat(page.path, equalTo("deletePost.html")) + } + + @Test + fun `page requires login`() { + assertThat(page.requiresLogin(), equalTo(true)) + } + + @Test fun `get request with invalid post redirects to no permission page`() { request("", GET) verifyRedirect("noPermission.html") -- 2.7.4