X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=1d4aa68fc2242693f30c5074f8529458b223e87e;hp=1881a1b681e4936704fac382773997ea8e5aebf0;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792

diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
index 1881a1b..1d4aa68 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,12 +59,12 @@ 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);
@@ -70,7 +72,7 @@ public class ListNotificationFilters {
 					filteredNotifications.add(filteredNotification);
 				}
 			} 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);
@@ -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,9 +243,8 @@ 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;
 			}
 		}
@@ -282,11 +283,11 @@ 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) {
+		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()) {