X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FIndexPage.java;h=00ccc35ccec41de61ce1ba014d05db4a6398b81a;hb=62ebf3da00001abb841c92128c4fdb57d0795ee2;hp=47f2715347b6bc8ea683aed402ce25235f608119;hpb=78cd820b392069def4640d45497e4097ef031d53;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 47f2715..00ccc35 100644 --- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java +++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java @@ -19,7 +19,6 @@ 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; @@ -41,7 +40,7 @@ public class IndexPage extends SoneTemplatePage { * The Sone web interface */ public IndexPage(Template template, WebInterface webInterface) { - super("index.html", template, "Page.Index.Title", webInterface); + super("index.html", template, "Page.Index.Title", webInterface, true); } // @@ -57,30 +56,14 @@ 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()); - } - Collections.sort(allPosts, new Comparator() { - - @Override - public int compare(Post leftPost, Post rightPost) { - return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightPost.getTime() - leftPost.getTime())); + for (String friendSoneId : sone.getFriends()) { + if (!webInterface.getCore().hasSone(friendSoneId)) { + continue; } - - }); + allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts()); + } + Collections.sort(allPosts, Post.TIME_COMPARATOR); template.set("posts", allPosts); } - // - // SONETEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected boolean requiresLogin() { - return true; - } - }