X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FBookmarksPage.java;h=d6f63aa8beac66e7610914f6b725348c8051e4dd;hp=d8a18c8e77d58aeb5ce0b08746acdc3f35044389;hb=70ae6c8bb784c24ac183bb485d0efa324fa0acd2;hpb=190bfffdc3ace288704f8f122580f8d3d7f5957c

diff --git a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java b/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
index d8a18c8..d6f63aa 100644
--- a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
@@ -24,6 +24,8 @@ import java.util.Set;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.util.collection.Pagination;
+import net.pterodactylus.util.filter.Filter;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -57,12 +59,20 @@ public class BookmarksPage extends SoneTemplatePage {
 	@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);
+		Set<Post> allPosts = webInterface.getCore().getBookmarkedPosts();
+		Set<Post> loadedPosts = Filters.filteredSet(allPosts, new Filter<Post>() {
+
+			@Override
+			public boolean filterObject(Post post) {
+				return post.getSone() != null;
+			}
+		});
+		List<Post> sortedPosts = new ArrayList<Post>(loadedPosts);
 		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
 		Pagination<Post> pagination = new Pagination<Post>(sortedPosts, 25).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
 		templateContext.set("pagination", pagination);
 		templateContext.set("posts", pagination.getItems());
+		templateContext.set("postsNotLoaded", allPosts.size() != loadedPosts.size());
 	}
 
 }