X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FNewPage.java;h=7973d2890b26b6089d83c2cc97cbdc1efc7d8df9;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=c7281e315f1d8996ef65d83c27658bc035c11dd2;hpb=85aa9c556ef8ac726694f0077a4f8df0bc912e5f;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 c7281e3..7973d28 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 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 @@ -19,6 +19,7 @@ package net.pterodactylus.sone.web; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -31,6 +32,8 @@ import net.pterodactylus.util.number.Numbers; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; +import com.google.common.collect.Collections2; + /** * Page that displays all new posts and replies. The posts are filtered using * {@link ListNotificationFilters#filterPosts(java.util.Collection, net.pterodactylus.sone.data.Sone)} @@ -56,17 +59,14 @@ public class NewPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inherit} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); /* collect new elements from notifications. */ - Set posts = webInterface.getNewPosts(); - for (PostReply reply : webInterface.getNewReplies()) { - posts.add(reply.getPost()); + Set posts = new HashSet(webInterface.getNewPosts()); + for (PostReply reply : Collections2.filter(webInterface.getNewReplies(), PostReply.HAS_POST_FILTER)) { + posts.add(reply.getPost().get()); } /* filter and sort them. */