X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=1881a1b681e4936704fac382773997ea8e5aebf0;hb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;hp=3db8912779cc570907468a118a4ac00155f3da64;hpb=1bc78b582ac59f2438002997f5780db4dcee0a2a;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 3db8912..1881a1b 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–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
@@ -17,17 +17,19 @@
 
 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;
 
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Reply;
 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.
@@ -54,13 +56,24 @@ public class ListNotificationFilters {
 	public static List<Notification> filterNotifications(Collection<? extends Notification> notifications, Sone currentSone) {
 		List<Notification> filteredNotifications = new ArrayList<Notification>();
 		for (Notification notification : notifications) {
-			if (notification.getId().equals("new-post-notification")) {
+			if (notification.getId().equals("new-sone-notification")) {
+				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewSones").get())) {
+					continue;
+				}
+				filteredNotifications.add(notification);
+			} else if (notification.getId().equals("new-post-notification")) {
+				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewPosts").get())) {
+					continue;
+				}
 				ListNotification<Post> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, currentSone, true);
 				if (filteredNotification != null) {
 					filteredNotifications.add(filteredNotification);
 				}
 			} else if (notification.getId().equals("new-reply-notification")) {
-				ListNotification<Reply> filteredNotification = filterNewReplyNotification((ListNotification<Reply>) notification, currentSone);
+				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewReplies").get())) {
+					continue;
+				}
+				ListNotification<PostReply> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
 				if (filteredNotification != null) {
 					filteredNotifications.add(filteredNotification);
 				}
@@ -129,12 +142,12 @@ public class ListNotificationFilters {
 	 * @return The filtered new-reply notification, or {@code null} if the
 	 *         notification should be removed
 	 */
-	public static ListNotification<Reply> filterNewReplyNotification(ListNotification<Reply> newReplyNotification, Sone currentSone) {
+	public static ListNotification<PostReply> filterNewReplyNotification(ListNotification<PostReply> newReplyNotification, Sone currentSone) {
 		if (currentSone == null) {
 			return null;
 		}
-		List<Reply> newReplies = new ArrayList<Reply>();
-		for (Reply reply : newReplyNotification.getElements()) {
+		List<PostReply> newReplies = new ArrayList<PostReply>();
+		for (PostReply reply : newReplyNotification.getElements()) {
 			if (isReplyVisible(currentSone, reply)) {
 				newReplies.add(reply);
 			}
@@ -145,13 +158,36 @@ public class ListNotificationFilters {
 		if (newReplies.size() == newReplyNotification.getElements().size()) {
 			return newReplyNotification;
 		}
-		ListNotification<Reply> filteredNotification = new ListNotification<Reply>(newReplyNotification);
+		ListNotification<PostReply> filteredNotification = new ListNotification<PostReply>(newReplyNotification);
 		filteredNotification.setElements(newReplies);
 		filteredNotification.setLastUpdateTime(newReplyNotification.getLastUpdatedTime());
 		return filteredNotification;
 	}
 
 	/**
+	 * 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>
@@ -183,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;
@@ -198,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;
@@ -237,8 +280,8 @@ public class ListNotificationFilters {
 	 * @return {@code true} if the reply is considered visible, {@code false}
 	 *         otherwise
 	 */
-	public static boolean isReplyVisible(Sone sone, Reply reply) {
-		Validation.begin().isNotNull("Reply", reply).check();
+	public static boolean isReplyVisible(Sone sone, PostReply reply) {
+		checkNotNull(reply, "reply must not be null");
 		Post post = reply.getPost();
 		if (post == null) {
 			return false;