X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FIndexPage.java;h=ad59f30a9662ae3b3401540fd7a48c3aa230cd35;hb=540d77dbd88133a950ebf240f35557aaf98e272e;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..ad59f30 100644
--- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@ -19,12 +19,15 @@ 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.filter.Filters;
+import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * The index page shows the main page of Sone. This page will contain the posts
@@ -52,23 +55,29 @@ public class IndexPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) throws RedirectException {
-		super.processTemplate(request, template);
-		Sone sone = getCurrentSone(request.getToadletContext());
+	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+		super.processTemplate(request, templateContext);
+		Sone currentSone = getCurrentSone(request.getToadletContext());
 		List<Post> allPosts = new ArrayList<Post>();
-		allPosts.addAll(sone.getPosts());
-		for (Sone friendSone : sone.getFriends()) {
-			allPosts.addAll(friendSone.getPosts());
+		allPosts.addAll(currentSone.getPosts());
+		for (String friendSoneId : currentSone.getFriends()) {
+			if (!webInterface.getCore().hasSone(friendSoneId)) {
+				continue;
+			}
+			allPosts.addAll(webInterface.getCore().getSone(friendSoneId).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 (Sone sone : webInterface.getCore().getSones()) {
+			for (Post post : sone.getPosts()) {
+				if (currentSone.equals(post.getRecipient()) && !allPosts.contains(post)) {
+					allPosts.add(post);
+				}
 			}
-
-		});
-		template.set("posts", allPosts);
+		}
+		allPosts = Filters.filteredList(allPosts, Post.FUTURE_POSTS_FILTER);
+		Collections.sort(allPosts, Post.TIME_COMPARATOR);
+		Pagination<Post> pagination = new Pagination<Post>(allPosts, 25).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+		templateContext.set("pagination", pagination);
+		templateContext.set("posts", pagination.getItems());
 	}
 
 }