X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=8a423c2c8b9db40e3823199e56f09795e21e8da3;hb=9f562b1024a26cd8841447c6e29c3d89039d7a22;hp=1881a1b681e4936704fac382773997ea8e5aebf0;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;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 1881a1b..8a423c2 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–2013 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
@@ -31,6 +31,8 @@ import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.freenet.wot.Trust;
 import net.pterodactylus.util.notify.Notification;
 
+import com.google.common.base.Optional;
+
 /**
  * Filter for {@link ListNotification}s.
  *
@@ -57,30 +59,30 @@ public class ListNotificationFilters {
 		List<Notification> filteredNotifications = new ArrayList<Notification>();
 		for (Notification notification : notifications) {
 			if (notification.getId().equals("new-sone-notification")) {
-				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewSones").get())) {
+				if ((currentSone != null) && !currentSone.getOptions().isShowNewSoneNotifications()) {
 					continue;
 				}
 				filteredNotifications.add(notification);
 			} else if (notification.getId().equals("new-post-notification")) {
-				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewPosts").get())) {
+				if ((currentSone != null) && !currentSone.getOptions().isShowNewPostNotifications()) {
 					continue;
 				}
-				ListNotification<Post> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, currentSone, true);
-				if (filteredNotification != null) {
-					filteredNotifications.add(filteredNotification);
+				Optional<ListNotification<Post>> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, currentSone, true);
+				if (filteredNotification.isPresent()) {
+					filteredNotifications.add(filteredNotification.get());
 				}
 			} else if (notification.getId().equals("new-reply-notification")) {
-				if ((currentSone != null) && (!currentSone.getOptions().getBooleanOption("ShowNotification/NewReplies").get())) {
+				if ((currentSone != null) && !currentSone.getOptions().isShowNewReplyNotifications()) {
 					continue;
 				}
-				ListNotification<PostReply> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
-				if (filteredNotification != null) {
-					filteredNotifications.add(filteredNotification);
+				Optional<ListNotification<PostReply>> filteredNotification = filterNewReplyNotification((ListNotification<PostReply>) notification, currentSone);
+				if (filteredNotification.isPresent()) {
+					filteredNotifications.add(filteredNotification.get());
 				}
 			} else if (notification.getId().equals("mention-notification")) {
-				ListNotification<Post> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, null, false);
-				if (filteredNotification != null) {
-					filteredNotifications.add(filteredNotification);
+				Optional<ListNotification<Post>> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, null, false);
+				if (filteredNotification.isPresent()) {
+					filteredNotifications.add(filteredNotification.get());
 				}
 			} else {
 				filteredNotifications.add(notification);
@@ -106,9 +108,9 @@ public class ListNotificationFilters {
 	 * @return The filtered new-post notification, or {@code null} if the
 	 *         notification should be removed
 	 */
-	public static ListNotification<Post> filterNewPostNotification(ListNotification<Post> newPostNotification, Sone currentSone, boolean soneRequired) {
+	private static Optional<ListNotification<Post>> filterNewPostNotification(ListNotification<Post> newPostNotification, Sone currentSone, boolean soneRequired) {
 		if (soneRequired && (currentSone == null)) {
-			return null;
+			return Optional.absent();
 		}
 		List<Post> newPosts = new ArrayList<Post>();
 		for (Post post : newPostNotification.getElements()) {
@@ -117,15 +119,15 @@ public class ListNotificationFilters {
 			}
 		}
 		if (newPosts.isEmpty()) {
-			return null;
+			return Optional.absent();
 		}
 		if (newPosts.size() == newPostNotification.getElements().size()) {
-			return newPostNotification;
+			return Optional.of(newPostNotification);
 		}
 		ListNotification<Post> filteredNotification = new ListNotification<Post>(newPostNotification);
 		filteredNotification.setElements(newPosts);
 		filteredNotification.setLastUpdateTime(newPostNotification.getLastUpdatedTime());
-		return filteredNotification;
+		return Optional.of(filteredNotification);
 	}
 
 	/**
@@ -142,9 +144,9 @@ public class ListNotificationFilters {
 	 * @return The filtered new-reply notification, or {@code null} if the
 	 *         notification should be removed
 	 */
-	public static ListNotification<PostReply> filterNewReplyNotification(ListNotification<PostReply> newReplyNotification, Sone currentSone) {
+	private static Optional<ListNotification<PostReply>> filterNewReplyNotification(ListNotification<PostReply> newReplyNotification, Sone currentSone) {
 		if (currentSone == null) {
-			return null;
+			return Optional.absent();
 		}
 		List<PostReply> newReplies = new ArrayList<PostReply>();
 		for (PostReply reply : newReplyNotification.getElements()) {
@@ -153,15 +155,15 @@ public class ListNotificationFilters {
 			}
 		}
 		if (newReplies.isEmpty()) {
-			return null;
+			return Optional.absent();
 		}
 		if (newReplies.size() == newReplyNotification.getElements().size()) {
-			return newReplyNotification;
+			return Optional.of(newReplyNotification);
 		}
 		ListNotification<PostReply> filteredNotification = new ListNotification<PostReply>(newReplyNotification);
 		filteredNotification.setElements(newReplies);
 		filteredNotification.setLastUpdateTime(newReplyNotification.getLastUpdatedTime());
-		return filteredNotification;
+		return Optional.of(filteredNotification);
 	}
 
 	/**
@@ -220,10 +222,10 @@ public class ListNotificationFilters {
 	 */
 	public static boolean isPostVisible(Sone sone, Post post) {
 		checkNotNull(post, "post must not be null");
-		Sone postSone = post.getSone();
-		if (postSone == null) {
+		if (!post.isLoaded()) {
 			return false;
 		}
+		Sone postSone = post.getSone();
 		if (sone != null) {
 			Trust trust = postSone.getIdentity().getTrust((OwnIdentity) sone.getIdentity());
 			if (trust != null) {
@@ -241,16 +243,12 @@ public class ListNotificationFilters {
 				 * 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())) {
+			if ((!postSone.equals(sone)) && !sone.hasFriend(postSone.getId()) && !sone.getId().equals(post.getRecipientId().orNull())) {
 				return false;
 			}
 		}
-		if (post.getTime() > System.currentTimeMillis()) {
-			return false;
-		}
-		return true;
+		return post.getTime() <= System.currentTimeMillis();
 	}
 
 	/**
@@ -282,17 +280,14 @@ public class ListNotificationFilters {
 	 */
 	public static boolean isReplyVisible(Sone sone, PostReply reply) {
 		checkNotNull(reply, "reply must not be null");
-		Post post = reply.getPost();
-		if (post == null) {
-			return false;
-		}
-		if (!isPostVisible(sone, post)) {
+		Optional<Post> post = reply.getPost();
+		if (!post.isPresent()) {
 			return false;
 		}
-		if (reply.getTime() > System.currentTimeMillis()) {
+		if (!isPostVisible(sone, post.get())) {
 			return false;
 		}
-		return true;
+		return reply.getTime() <= System.currentTimeMillis();
 	}
 
 }