X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=2e2ee18ac79ebc60df1f80d2b61ffa39005f6559;hb=cce88f819ae0ef84b5a86c6a826f88ce0208107f;hp=51bb1c0abf5e056439a6288f8861c59f04900ba5;hpb=a47643aed43d118ca68044f95451bb5374cdb332;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 51bb1c0..2e2ee18 100644 --- a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java +++ b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java @@ -17,6 +17,8 @@ package net.pterodactylus.sone.notify; +import static com.google.common.base.Preconditions.checkNotNull; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -28,7 +30,6 @@ import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.freenet.wot.OwnIdentity; import net.pterodactylus.sone.freenet.wot.Trust; import net.pterodactylus.util.notify.Notification; -import net.pterodactylus.util.validation.Validation; /** * Filter for {@link ListNotification}s. @@ -218,7 +219,7 @@ public class ListNotificationFilters { * otherwise */ public static boolean isPostVisible(Sone sone, Post post) { - Validation.begin().isNotNull("Post", post).check(); + checkNotNull(post, "post must not be null"); Sone postSone = post.getSone(); if (postSone == null) { return false; @@ -233,7 +234,14 @@ public class ListNotificationFilters { return false; } } else { - return false; + /* + * a null trust means that the trust updater has not yet + * received a trust value for this relation. if we return false, + * the post feed will stay empty until the trust updater has + * 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())) { return false; @@ -273,7 +281,7 @@ public class ListNotificationFilters { * otherwise */ public static boolean isReplyVisible(Sone sone, PostReply reply) { - Validation.begin().isNotNull("Reply", reply).check(); + checkNotNull(reply, "reply must not be null"); Post post = reply.getPost(); if (post == null) { return false;