X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FIndexPage.java;h=756252693d9c91c08b173750c635336421c036bb;hb=2a69c05787c49cdb8bf88a1d7e89226237f11d70;hp=589e7aa1244f8643e30bff835ccf63210f23ce3d;hpb=4c831fb948000bc1730ebcde73eeb62317f4ac54;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/IndexPage.java b/src/main/java/net/pterodactylus/sone/web/IndexPage.java index 589e7aa..7562526 100644 --- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java +++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java @@ -19,10 +19,10 @@ package net.pterodactylus.sone.web; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; import net.pterodactylus.sone.data.Post; +import net.pterodactylus.sone.data.Reply; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.util.template.Template; @@ -57,18 +57,29 @@ public class IndexPage extends SoneTemplatePage { Sone sone = getCurrentSone(request.getToadletContext()); List allPosts = new ArrayList(); allPosts.addAll(sone.getPosts()); - for (Sone friendSone : sone.getFriends()) { - allPosts.addAll(friendSone.getPosts()); + for (String friendSoneId : sone.getFriends()) { + if (!webInterface.getCore().hasSone(friendSoneId)) { + continue; + } + allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts()); } - Collections.sort(allPosts, new Comparator() { + Collections.sort(allPosts, Post.TIME_COMPARATOR); + template.set("posts", allPosts); + } - @Override - public int compare(Post leftPost, Post rightPost) { - return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightPost.getTime() - leftPost.getTime())); + /** + * {@inheritDoc} + */ + @Override + protected void postProcess(Request request, Template template) { + @SuppressWarnings("unchecked") + List posts = (List) template.get("posts"); + for (Post post : posts) { + webInterface.getCore().markPostKnown(post); + for (Reply reply : webInterface.getCore().getReplies(post)) { + webInterface.getCore().markReplyKnown(reply); } - - }); - template.set("posts", allPosts); + } } }