X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FBookmarksPage.java;h=b273bdb727552c0fe2fa3bfa5d6149ae8e291bae;hp=d8a18c8e77d58aeb5ce0b08746acdc3f35044389;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=d34cc2c44a2fb19104988534504f2a96a9f0cb93

diff --git a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java b/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
index d8a18c8..b273bdb 100644
--- a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - BookmarksPage.java - Copyright © 2011 David Roden
+ * 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
@@ -17,17 +17,23 @@
 
 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.number.Numbers;
 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.
  *
@@ -55,14 +61,21 @@ public class BookmarksPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
-		Set<Post> posts = webInterface.getCore().getBookmarkedPosts();
-		List<Post> sortedPosts = new ArrayList<Post>(posts);
-		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
-		Pagination<Post> pagination = new Pagination<Post>(sortedPosts, 25).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+	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());
 	}
 
 }