X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=7491e70aef7b3e0a33257253814fc323b82839a2;hb=871af6a15ec10c5df170955f5d65285a3f6982fb;hp=c4bc72850af68d33e2eb4509c1a5e77bf594bce9;hpb=a9e8b617d4a85bcb832b5ca15ba6dd2a9d08925f;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 c4bc728..7491e70 100644
--- a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
+++ b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
@@ -24,7 +24,10 @@ import java.util.List;
 import net.pterodactylus.sone.data.Post;
 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.
@@ -49,28 +52,22 @@ public class ListNotificationFilters {
 	 */
 	public static List<Notification> filterNotifications(List<Notification> notifications, Sone currentSone) {
 		ListNotification<Post> newPostNotification = getNotification(notifications, "new-post-notification", Post.class);
-		System.out.println("Found new-post-notification with " + ((newPostNotification != null) ? newPostNotification.getElements().size() : -1) + " posts.");
 		if (newPostNotification != null) {
 			ListNotification<Post> filteredNotification = filterNewPostNotification(newPostNotification, currentSone);
 			int notificationIndex = notifications.indexOf(newPostNotification);
 			if (filteredNotification == null) {
-				System.out.println("Removing notification.");
 				notifications.remove(notificationIndex);
 			} else {
-				System.out.println("Replacing Notification.");
 				notifications.set(notificationIndex, filteredNotification);
 			}
 		}
 		ListNotification<Reply> newReplyNotification = getNotification(notifications, "new-replies-notification", Reply.class);
-		System.out.println("Found new-reply-notification with " + ((newReplyNotification != null) ? newReplyNotification.getElements().size() : -1) + " replies.");
 		if (newReplyNotification != null) {
 			ListNotification<Reply> filteredNotification = filterNewReplyNotification(newReplyNotification, currentSone);
 			int notificationIndex = notifications.indexOf(newReplyNotification);
 			if (filteredNotification == null) {
-				System.out.println("Removing Notification.");
 				notifications.remove(notificationIndex);
 			} else {
-				System.out.println("Replacing Notification.");
 				notifications.set(notificationIndex, filteredNotification);
 			}
 		}
@@ -90,19 +87,19 @@ public class ListNotificationFilters {
 	 * @return The filtered new-post notification, or {@code null} if the
 	 *         notification should be removed
 	 */
-	private static ListNotification<Post> filterNewPostNotification(ListNotification<Post> newPostNotification, Sone currentSone) {
+	public static ListNotification<Post> filterNewPostNotification(ListNotification<Post> newPostNotification, Sone currentSone) {
 		if (currentSone == null) {
 			return null;
 		}
 		List<Post> newPosts = new ArrayList<Post>();
 		for (Post post : newPostNotification.getElements()) {
-			System.out.println("Checking Post: " + post);
-			if (currentSone.hasFriend(post.getSone().getId()) || currentSone.equals(post.getSone())) {
-				System.out.println("  CS.hF: " + currentSone.hasFriend(post.getSone().getId()));
-				System.out.println("  CS.e:" + currentSone.equals(post.getSone()));
+			if ((post.getSone() != null) && (currentSone.hasFriend(post.getSone().getId()) || currentSone.equals(post.getSone()) || currentSone.equals(post.getRecipient()))) {
 				newPosts.add(post);
 			}
 		}
+		if (newPosts.isEmpty()) {
+			return null;
+		}
 		if (newPosts.size() == newPostNotification.getElements().size()) {
 			return newPostNotification;
 		}
@@ -125,19 +122,19 @@ public class ListNotificationFilters {
 	 * @return The filtered new-reply notification, or {@code null} if the
 	 *         notification should be removed
 	 */
-	private static ListNotification<Reply> filterNewReplyNotification(ListNotification<Reply> newReplyNotification, Sone currentSone) {
+	public static ListNotification<Reply> filterNewReplyNotification(ListNotification<Reply> newReplyNotification, Sone currentSone) {
 		if (currentSone == null) {
 			return null;
 		}
 		List<Reply> newReplies = new ArrayList<Reply>();
 		for (Reply reply : newReplyNotification.getElements()) {
-			System.out.println("Checking Reply: " + reply);
-			if (currentSone.hasFriend(reply.getPost().getSone().getId()) || currentSone.equals(reply.getPost().getSone())) {
-				System.out.println("  CS.hF: " + currentSone.hasFriend(reply.getPost().getSone().getId()));
-				System.out.println("  CS.e: " + currentSone.equals(reply.getPost().getSone()));
+			if (((reply.getPost().getSone() != null) && currentSone.hasFriend(reply.getPost().getSone().getId())) || currentSone.equals(reply.getPost().getSone()) || currentSone.equals(reply.getPost().getRecipient())) {
 				newReplies.add(reply);
 			}
 		}
+		if (newReplies.isEmpty()) {
+			return null;
+		}
 		if (newReplies.size() == newReplyNotification.getElements().size()) {
 			return newReplyNotification;
 		}
@@ -172,4 +169,50 @@ public class ListNotificationFilters {
 		return null;
 	}
 
+	/**
+	 * 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>
+	 * <li>The post does not have a Sone.</li>
+	 * <li>The Sone of the post is not the given Sone, the given Sone does not
+	 * follow the post’s Sone, and the given Sone is not the recipient of the
+	 * post.</li>
+	 * <li>The trust relationship between the two Sones can not be retrieved.</li>
+	 * <li>The given Sone has explicitely assigned negative trust to the post’s
+	 * Sone.</li>
+	 * <li>The given Sone has not explicitely assigned negative trust to the
+	 * post’s Sone but the implicit trust is negative.</li>
+	 * </ul>
+	 * If none of these statements is true the post is considered visible.
+	 *
+	 * @param sone
+	 *            The Sone that checks for a post’s visibility
+	 * @param post
+	 *            The post to check for visibility
+	 * @return {@code true} if the post is considered visible, {@code false}
+	 *         otherwise
+	 */
+	public static boolean isPostVisible(Sone sone, Post post) {
+		Validation.begin().isNotNull("Sone", sone).isNotNull("Post", post).check().isNotNull("Sone’s Identity", sone.getIdentity()).check().isInstanceOf("Sone’s Identity", sone.getIdentity(), OwnIdentity.class).check();
+		Sone postSone = post.getSone();
+		if (postSone == null) {
+			return false;
+		}
+		Trust trust = postSone.getIdentity().getTrust((OwnIdentity) sone.getIdentity());
+		if (trust != null) {
+			if ((trust.getExplicit() != null) && (trust.getExplicit() < 0)) {
+				return false;
+			}
+			if ((trust.getExplicit() == null) && (trust.getImplicit() != null) && (trust.getImplicit() < 0)) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+		if ((!postSone.equals(sone)) && !sone.hasFriend(postSone.getId()) && !sone.equals(post.getRecipient())) {
+			return false;
+		}
+		return true;
+	}
+
 }