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

diff --git a/src/main/java/net/pterodactylus/sone/web/NewPage.java b/src/main/java/net/pterodactylus/sone/web/NewPage.java
index 1757952..2b99adb 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 © 2013–2015 David Roden
+ * Sone - NewPage.java - Copyright © 2013–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
@@ -25,11 +25,10 @@ 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.data.Sone;
+import net.pterodactylus.sone.notify.PostVisibilityFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.template.Template;
@@ -37,8 +36,7 @@ import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * Page that displays all new posts and replies. The posts are filtered using
- * {@link ListNotificationFilters#filterPosts(java.util.Collection, net.pterodactylus.sone.data.Sone)}
- * and sorted by time.
+ * {@link PostVisibilityFilter#isPostVisible(Sone, Post)} and sorted by time.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
@@ -68,13 +66,13 @@ public class NewPage extends SoneTemplatePage {
 		super.processTemplate(request, templateContext);
 
 		/* collect new elements from notifications. */
-		Set<Post> posts = new HashSet<Post>(webInterface.getNewPosts());
-		for (PostReply reply : Collections2.filter(webInterface.getNewReplies(), PostReply.HAS_POST_FILTER)) {
+		Set<Post> posts = new HashSet<Post>(webInterface.getNewPosts(getCurrentSone(request.getToadletContext(), false)));
+		for (PostReply reply : webInterface.getNewReplies(getCurrentSone(request.getToadletContext(), false))) {
 			posts.add(reply.getPost().get());
 		}
 
 		/* filter and sort them. */
-		List<Post> sortedPosts = ListNotificationFilters.filterPosts(new ArrayList<Post>(posts), webInterface.getCurrentSone(request.getToadletContext(), false));
+		List<Post> sortedPosts = new ArrayList(posts);
 		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
 
 		/* paginate them. */