X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=6efee27187adf5e2f9e54e2ad7e12078581c0c50;hp=beeb81e7f08c0da4686a4472d45323a70671a68f;hb=f3728b9ea96e07235ae0b11a7b390d2af525d482;hpb=43a21f859e9fec31096c1540148bdd44a8e3702f

diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
index beeb81e..6efee27 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
@@ -55,12 +55,23 @@ 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")) {
+				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewReplies").get())) {
+					continue;
+				}
 				ListNotification<PostReply> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
 				if (filteredNotification != null) {
 					filteredNotifications.add(filteredNotification);
@@ -153,6 +164,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>
@@ -199,7 +233,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;