From f82bb98082031beef8316c8ea7f4e95fd3bd37a2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Sun, 4 Jun 2017 19:57:15 +0200
Subject: [PATCH] Replace view post page with Kotlin version

---
 .../pterodactylus/sone/web/pages/ViewPostPage.java | 90 ----------------------
 .../pterodactylus/sone/web/pages/ViewPostPage.kt   | 34 ++++++++
 2 files changed, 34 insertions(+), 90 deletions(-)
 delete mode 100644 src/main/java/net/pterodactylus/sone/web/pages/ViewPostPage.java
 create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt

diff --git a/src/main/java/net/pterodactylus/sone/web/pages/ViewPostPage.java b/src/main/java/net/pterodactylus/sone/web/pages/ViewPostPage.java
deleted file mode 100644
index 12d6be9..0000000
--- a/src/main/java/net/pterodactylus/sone/web/pages/ViewPostPage.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Sone - ViewPostPage.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 <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.web.pages;
-
-import java.net.URI;
-
-import com.google.common.base.Optional;
-
-import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.template.SoneAccessor;
-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;
-
-/**
- * This page lets the user view a post and all its replies.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class ViewPostPage extends SoneTemplatePage {
-
-	/**
-	 * Creates a new “view post” page.
-	 *
-	 * @param template
-	 *            The template to render
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public ViewPostPage(Template template, WebInterface webInterface) {
-		super("viewPost.html", template, "Page.ViewPost.Title", webInterface, false);
-	}
-
-	//
-	// TEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getPageTitle(FreenetRequest request) {
-		String postId = request.getHttpRequest().getParam("post");
-		Optional<Post> post = webInterface.getCore().getPost(postId);
-		String title = "";
-		if (post.isPresent()) {
-			title = post.get().getText().substring(0, Math.min(20, post.get().getText().length())) + "…";
-			title += " - " + SoneAccessor.getNiceName(post.get().getSone()) + " - ";
-		}
-		title += webInterface.getL10n().getString("Page.ViewPost.Title");
-		return title;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		String postId = request.getHttpRequest().getParam("post");
-		boolean raw = request.getHttpRequest().getParam("raw").equals("true");
-		Optional<Post> post = webInterface.getCore().getPost(postId);
-		templateContext.set("post", post.orNull());
-		templateContext.set("raw", raw);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isLinkExcepted(URI link) {
-		return true;
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt
new file mode 100644
index 0000000..d2e163d
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt
@@ -0,0 +1,34 @@
+package net.pterodactylus.sone.web.pages
+
+import net.pterodactylus.sone.template.SoneAccessor
+import net.pterodactylus.sone.utils.let
+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.net.URI
+
+/**
+ * This page lets the user view a post and all its replies.
+ */
+class ViewPostPage(template: Template, webInterface: WebInterface):
+		SoneTemplatePage("viewPost.html", template, "Page.ViewPost.Title", webInterface, false) {
+
+	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+		templateContext["post"] = request.parameters["post"].let(webInterface.core::getPost).orNull()
+		templateContext["raw"] = request.parameters["raw"] == "true"
+	}
+
+	override fun isLinkExcepted(link: URI?) = true
+
+	public override fun getPageTitle(request: FreenetRequest) =
+			(request.parameters["post"].let(webInterface.core::getPost).let {
+				if (it.text.length > 20) {
+					it.text.substring(0..19) + "…"
+				} else {
+					it.text
+				} + " - ${SoneAccessor.getNiceName(it.sone)} - "
+			} ?: "") + super.getPageTitle(request)
+
+}
-- 
2.7.4