X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=f431bb71f591cd718ffcbdba2bb63415965bb18e;hb=6e9a43ccd93ae125720547c0fe421dc81a54ba90;hp=2e2ee18ac79ebc60df1f80d2b61ffa39005f6559;hpb=cce88f819ae0ef84b5a86c6a826f88ce0208107f;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 2e2ee18..f431bb7 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–2012 David Roden
+ * Sone - ListNotificationFilters.java - Copyright © 2010–2013 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.
  *
@@ -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()) {