X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FIndexPage.java;h=ff7395e9f88463c71c5ccf818fef8e57cb0bd6ed;hb=d5efb086bee8f103cbe90c7a953ffbb7ff27b689;hp=e675311afb4bbfbc3f8e720da72b60db912be69d;hpb=e3395d9dd51f56240e4cb9509ccd403bf5f9e343;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 e675311..ff7395e 100644
--- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - IndexPage.java - Copyright © 2010 David Roden
+ * Sone - IndexPage.java - Copyright © 2010–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
@@ -18,17 +18,23 @@
 package net.pterodactylus.sone.web;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 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;
 
+import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.primitives.Ints;
+
 /**
  * The index page shows the main page of Sone. This page will contain the posts
  * of all friends of the current user.
@@ -55,10 +61,10 @@ public class IndexPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
-		Sone currentSone = getCurrentSone(request.getToadletContext());
-		List<Post> allPosts = new ArrayList<Post>();
+		final Sone currentSone = getCurrentSone(request.getToadletContext());
+		Collection<Post> allPosts = new ArrayList<Post>();
 		allPosts.addAll(currentSone.getPosts());
 		for (String friendSoneId : currentSone.getFriends()) {
 			if (!webInterface.getCore().hasSone(friendSoneId)) {
@@ -73,9 +79,17 @@ public class IndexPage extends SoneTemplatePage {
 				}
 			}
 		}
-		allPosts = Filters.filteredList(allPosts, Post.FUTURE_POSTS_FILTER);
-		Collections.sort(allPosts, Post.TIME_COMPARATOR);
-		Pagination<Post> pagination = new Pagination<Post>(allPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+		allPosts = Collections2.filter(allPosts, new Predicate<Post>() {
+
+			@Override
+			public boolean apply(Post post) {
+				return ListNotificationFilters.isPostVisible(currentSone, post);
+			}
+		});
+		allPosts = Collections2.filter(allPosts, Post.FUTURE_POSTS_FILTER);
+		List<Post> sortedPosts = new ArrayList<Post>(allPosts);
+		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
+		Pagination<Post> pagination = new Pagination<Post>(sortedPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Optional.fromNullable(Ints.tryParse(request.getHttpRequest().getParam("page"))).or(0));
 		templateContext.set("pagination", pagination);
 		templateContext.set("posts", pagination.getItems());
 	}