Update years in copyright line

[Sone.git] / src / main / java / net / pterodactylus / sone / notify / ListNotificationFilters.java

diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
index beeb81e..1d4aa68 100644 (file)
--- 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–2015 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,8 @@ 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;
+
+import com.google.common.base.Optional;
 
 /**
  * Filter for {@link ListNotification}s.
@@ -55,12 +58,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().isShowNewSoneNotifications()) {
+                                       continue;
+                               }
+                               filteredNotifications.add(notification);
+                       } else if (notification.getId().equals("new-post-notification")) {
+                               if ((currentSone != null) && !currentSone.getOptions().isShowNewPostNotifications()) {
+                                       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().isShowNewReplyNotifications()) {
+                                       continue;
+                               }
                                ListNotification<PostReply> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
                                if (filteredNotification != null) {
                                        filteredNotifications.add(filteredNotification);
@@ -153,6 +167,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>
@@ -184,11 +221,11 @@ public class ListNotificationFilters {
         *         otherwise
         */
        public static boolean isPostVisible(Sone sone, Post post) {
-               Validation.begin().isNotNull("Post", post).check();
-               Sone postSone = post.getSone();
-               if (postSone == null) {
+               checkNotNull(post, "post must not be null");
+               if (!post.isLoaded()) {
                        return false;
                }
+               Sone postSone = post.getSone();
                if (sone != null) {
                        Trust trust = postSone.getIdentity().getTrust((OwnIdentity) sone.getIdentity());
                        if (trust != null) {
@@ -199,9 +236,15 @@ 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.
+                                */
                        }
-                       if ((!postSone.equals(sone)) && !sone.hasFriend(postSone.getId()) && !sone.equals(post.getRecipient())) {
+                       if ((!postSone.equals(sone)) && !sone.hasFriend(postSone.getId()) && !sone.getId().equals(post.getRecipientId().orNull())) {
                                return false;
                        }
                }
@@ -239,12 +282,12 @@ public class ListNotificationFilters {
         *         otherwise
         */
        public static boolean isReplyVisible(Sone sone, PostReply reply) {
-               Validation.begin().isNotNull("Reply", reply).check();
-               Post post = reply.getPost();
-               if (post == null) {
+               checkNotNull(reply, "reply must not be null");
+               Optional<Post> post = reply.getPost();
+               if (!post.isPresent()) {
                        return false;
                }
-               if (!isPostVisible(sone, post)) {
+               if (!isPostVisible(sone, post.get())) {
                        return false;
                }
                if (reply.getTime() > System.currentTimeMillis()) {