X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FNewPage.java;h=af0843aa8860d1282dbe9d24f5c54cf4dbf17560;hb=ed4690d3d7ee4bda179aacadf9db461a06d60e9c;hp=175795262fee1ef5cc8221cdb0e96f153b36bdee;hpb=76ed638264e531a26e35647d13702db865a52321;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..af0843a 100644
--- a/src/main/java/net/pterodactylus/sone/web/NewPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/NewPage.java
@@ -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 David âBombeâ Roden
*/
@@ -68,13 +66,13 @@ public class NewPage extends SoneTemplatePage {
super.processTemplate(request, templateContext);
/* collect new elements from notifications. */
- Set posts = new HashSet(webInterface.getNewPosts());
- for (PostReply reply : Collections2.filter(webInterface.getNewReplies(), PostReply.HAS_POST_FILTER)) {
+ Set posts = new HashSet(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 sortedPosts = ListNotificationFilters.filterPosts(new ArrayList(posts), webInterface.getCurrentSone(request.getToadletContext(), false));
+ List sortedPosts = new ArrayList(posts);
Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
/* paginate them. */