X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FNewPage.java;h=175795262fee1ef5cc8221cdb0e96f153b36bdee;hp=c7281e315f1d8996ef65d83c27658bc035c11dd2;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=85aa9c556ef8ac726694f0077a4f8df0bc912e5f

diff --git a/src/main/java/net/pterodactylus/sone/web/NewPage.java b/src/main/java/net/pterodactylus/sone/web/NewPage.java
index c7281e3..1757952 100644
--- a/src/main/java/net/pterodactylus/sone/web/NewPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/NewPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - NewPage.java - Copyright © 2012 David Roden
+ * Sone - NewPage.java - Copyright © 2013–2015 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,21 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.collect.Collections2;
+
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.notify.ListNotificationFilters;
 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;
 
@@ -57,16 +61,16 @@ public class NewPage extends SoneTemplatePage {
 	//
 
 	/**
-	 * {@inherit}
+	 * {@inheritDoc}
 	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 
 		/* collect new elements from notifications. */
-		Set<Post> posts = webInterface.getNewPosts();
-		for (PostReply reply : webInterface.getNewReplies()) {
-			posts.add(reply.getPost());
+		Set<Post> posts = new HashSet<Post>(webInterface.getNewPosts());
+		for (PostReply reply : Collections2.filter(webInterface.getNewReplies(), PostReply.HAS_POST_FILTER)) {
+			posts.add(reply.getPost().get());
 		}
 
 		/* filter and sort them. */
@@ -74,7 +78,7 @@ public class NewPage extends SoneTemplatePage {
 		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
 
 		/* paginate them. */
-		Pagination<Post> pagination = new Pagination<Post>(sortedPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+		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());
 	}