X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=2a98ec8e0d172deac069551b2d562952edef678c;hb=58eeba9b521b0a0094ac90a37fd88811c6a27376;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..2a98ec8 100644
--- a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
+++ b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
@@ -49,28 +49,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);
 			}
 		}
@@ -96,13 +90,13 @@ public class ListNotificationFilters {
 		}
 		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 (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;
 		}
@@ -131,13 +125,13 @@ public class ListNotificationFilters {
 		}
 		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 (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;
 		}