From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 8 Feb 2017 19:27:35 +0000 (+0100)
Subject: Replace bookmarks page with Kotlin version
X-Git-Tag: 0.9.7^2~303
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=826492b44d1bc8ea2d315d528723d302f011ca74;p=Sone.git

Replace bookmarks page with Kotlin version
---

diff --git a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java b/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
deleted file mode 100644
index b273bdb..0000000
--- a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Sone - BookmarksPage.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 <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.web;
-
-import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.collection.Pagination;
-import net.pterodactylus.util.template.Template;
-import net.pterodactylus.util.template.TemplateContext;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-
-/**
- * Page that lets the user browse all his bookmarked posts.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class BookmarksPage extends SoneTemplatePage {
-
-	/**
-	 * Creates a new bookmarks page.
-	 *
-	 * @param template
-	 *            The template to render
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public BookmarksPage(Template template, WebInterface webInterface) {
-		super("bookmarks.html", template, "Page.Bookmarks.Title", webInterface);
-	}
-
-	//
-	// SONETEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		Set<Post> allPosts = webInterface.getCore().getBookmarkedPosts();
-		Collection<Post> loadedPosts = Collections2.filter(allPosts, new Predicate<Post>() {
-
-			@Override
-			public boolean apply(Post post) {
-				return post.isLoaded();
-			}
-		});
-		List<Post> sortedPosts = new ArrayList<Post>(loadedPosts);
-		Collections.sort(sortedPosts, Post.NEWEST_FIRST);
-		Pagination<Post> pagination = new Pagination<Post>(sortedPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(parseInt(request.getHttpRequest().getParam("page"), 0));
-		templateContext.set("pagination", pagination);
-		templateContext.set("posts", pagination.getItems());
-		templateContext.set("postsNotLoaded", allPosts.size() != loadedPosts.size());
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/BookmarksPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/BookmarksPage.kt
new file mode 100644
index 0000000..25d3317
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/BookmarksPage.kt
@@ -0,0 +1,23 @@
+package net.pterodactylus.sone.web
+
+import net.pterodactylus.sone.data.Post
+import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.util.collection.Pagination
+import net.pterodactylus.util.template.Template
+import net.pterodactylus.util.template.TemplateContext
+
+/**
+ * Page that lets the user browse all his bookmarked posts.
+ */
+class BookmarksPage(template: Template, webInterface: WebInterface): SoneTemplatePage("bookmarks.html", template, "Page.Bookmarks.Title", webInterface) {
+
+	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+		webInterface.core.bookmarkedPosts.let { posts ->
+			val pagination = Pagination<Post>(posts.filter { it.isLoaded }.sortedByDescending { it.time }, webInterface.core.preferences.postsPerPage)
+			templateContext["pagination"] = pagination
+			templateContext["posts"] = pagination.items
+			templateContext["postsNotLoaded"] = posts.any { !it.isLoaded }
+		}
+	}
+
+}