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=67d11c694f925677034b253dcd5f31a12b4d50ad;hpb=680d60dc6802454fe812f1ceea163a1415aaee0e;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 67d11c6..00ccc35 100644
--- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@ -19,12 +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.Sone;
-import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.template.Template;
 
 /**
@@ -42,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);
 	}
 
 	//
@@ -58,34 +56,14 @@ public class IndexPage extends SoneTemplatePage {
 		Sone sone = getCurrentSone(request.getToadletContext());
 		List<Post> allPosts = new ArrayList<Post>();
 		allPosts.addAll(sone.getPosts());
-		for (Sone friendSone : sone.getFriends()) {
-			allPosts.addAll(friendSone.getPosts());
-		}
-		Collections.sort(allPosts, new Comparator<Post>() {
-
-			@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;
 			}
-
-		});
-		int page = request.getHttpRequest().getIntParam("page", 0);
-		Pagination<Post> postPagination = new Pagination<Post>(allPosts, 25).setPage(page);
-		List<Post> postsOnPage = postPagination.getItems();
-		template.set("posts", postsOnPage);
-		template.set("pagination", postPagination);
-	}
-
-	//
-	// SONETEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean requiresLogin() {
-		return true;
+			allPosts.addAll(webInterface.getCore().getSone(friendSoneId).getPosts());
+		}
+		Collections.sort(allPosts, Post.TIME_COMPARATOR);
+		template.set("posts", allPosts);
 	}
 
 }