X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=1261fc994ebf4082b8eb3ebd9e67b8320386b798;hb=961a1cfe36ab3b4f6d74931b16098071eb6aaa95;hp=52890816c0f5440043db6fdec02fdf57d0fc6112;hpb=e25b3f1ea99a8dffc55efe4b68246937a55ebd33;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 5289081..1261fc9 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
@@ -108,7 +108,7 @@ 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 ListNotification<Post> filterNewPostNotification(ListNotification<Post> newPostNotification, Sone currentSone, boolean soneRequired) {
 		if (soneRequired && (currentSone == null)) {
 			return null;
 		}
@@ -144,7 +144,7 @@ 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 ListNotification<PostReply> filterNewReplyNotification(ListNotification<PostReply> newReplyNotification, Sone currentSone) {
 		if (currentSone == null) {
 			return null;
 		}
@@ -222,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) {
@@ -248,10 +248,7 @@ public class ListNotificationFilters {
 				return false;
 			}
 		}
-		if (post.getTime() > System.currentTimeMillis()) {
-			return false;
-		}
-		return true;
+		return post.getTime() <= System.currentTimeMillis();
 	}
 
 	/**
@@ -290,10 +287,7 @@ public class ListNotificationFilters {
 		if (!isPostVisible(sone, post.get())) {
 			return false;
 		}
-		if (reply.getTime() > System.currentTimeMillis()) {
-			return false;
-		}
-		return true;
+		return reply.getTime() <= System.currentTimeMillis();
 	}
 
 }