X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=2e2ee18ac79ebc60df1f80d2b61ffa39005f6559;hb=cce88f819ae0ef84b5a86c6a826f88ce0208107f;hp=7b9eb49a92faabe6bc26ed7c38b93da706e7417c;hpb=7d5aff5d52afa5d9725ce252c846b1aca6f1a761;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
index 7b9eb49..2e2ee18 100644
--- a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
+++ b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ListNotificationFilters.java - Copyright © 2010 David Roden
+ * Sone - ListNotificationFilters.java - Copyright © 2010–2012 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
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.notify;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -28,7 +30,6 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.freenet.wot.Trust;
 import net.pterodactylus.util.notify.Notification;
-import net.pterodactylus.util.validation.Validation;
 
 /**
  * Filter for {@link ListNotification}s.
@@ -164,6 +165,29 @@ public class ListNotificationFilters {
 	}
 
 	/**
+	 * Filters the given posts, using {@link #isPostVisible(Sone, Post)} to
+	 * decide whether a post should be contained in the returned list. If
+	 * {@code currentSone} is not {@code null} it is used to filter out posts
+	 * that are from Sones that are not followed or not trusted by the given
+	 * Sone.
+	 *
+	 * @param posts
+	 *            The posts to filter
+	 * @param currentSone
+	 *            The current Sone (may be {@code null})
+	 * @return The filtered posts
+	 */
+	public static List<Post> filterPosts(Collection<Post> posts, Sone currentSone) {
+		List<Post> filteredPosts = new ArrayList<Post>();
+		for (Post post : posts) {
+			if (isPostVisible(currentSone, post)) {
+				filteredPosts.add(post);
+			}
+		}
+		return filteredPosts;
+	}
+
+	/**
 	 * Checks whether a post is visible to the given Sone. A post is not
 	 * considered visible if one of the following statements is true:
 	 * <ul>
@@ -195,7 +219,7 @@ public class ListNotificationFilters {
 	 *         otherwise
 	 */
 	public static boolean isPostVisible(Sone sone, Post post) {
-		Validation.begin().isNotNull("Post", post).check();
+		checkNotNull(post, "post must not be null");
 		Sone postSone = post.getSone();
 		if (postSone == null) {
 			return false;
@@ -210,7 +234,14 @@ public class ListNotificationFilters {
 					return false;
 				}
 			} else {
-				return false;
+				/*
+				 * a null trust means that the trust updater has not yet
+				 * received a trust value for this relation. if we return false,
+				 * the post feed will stay empty until the trust updater has
+				 * received trust values. to prevent this we simply assume that
+				 * posts are visible if there is no trust.
+				 */
+				return true;
 			}
 			if ((!postSone.equals(sone)) && !sone.hasFriend(postSone.getId()) && !sone.equals(post.getRecipient())) {
 				return false;
@@ -250,7 +281,7 @@ public class ListNotificationFilters {
 	 *         otherwise
 	 */
 	public static boolean isReplyVisible(Sone sone, PostReply reply) {
-		Validation.begin().isNotNull("Reply", reply).check();
+		checkNotNull(reply, "reply must not be null");
 		Post post = reply.getPost();
 		if (post == null) {
 			return false;