From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 27 Apr 2011 19:47:19 +0000 (+0200)
Subject: Use post visibility method to filter the post feed.
X-Git-Tag: 0.6.3^2~5
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=bf47af32fc2322b651b12b01f969fbeda6d33f3e

Use post visibility method to filter the post feed.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/IndexPage.java b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
index 922d5ef..35b88a9 100644
--- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@ -23,7 +23,9 @@ 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.util.collection.Pagination;
+import net.pterodactylus.util.filter.Filter;
 import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
@@ -57,7 +59,7 @@ public class IndexPage extends SoneTemplatePage {
 	@Override
 	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
-		Sone currentSone = getCurrentSone(request.getToadletContext());
+		final Sone currentSone = getCurrentSone(request.getToadletContext());
 		List<Post> allPosts = new ArrayList<Post>();
 		allPosts.addAll(currentSone.getPosts());
 		for (String friendSoneId : currentSone.getFriends()) {
@@ -73,6 +75,13 @@ public class IndexPage extends SoneTemplatePage {
 				}
 			}
 		}
+		allPosts = Filters.filteredList(allPosts, new Filter<Post>() {
+
+			@Override
+			public boolean filterObject(Post post) {
+				return ListNotificationFilters.isPostVisible(currentSone, post);
+			}
+		});
 		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));