X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=f93e1f4ed5fb2cf6c83fda2e4860217daaa3aefe;hp=dbf09a350651199cda5738bc783538036c26994c;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hpb=8503021c00d63885288c507d9930fefabd5d7678 diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java index dbf09a3..f93e1f4 100644 --- a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java +++ b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java @@ -59,12 +59,12 @@ public class ListNotificationFilters { List filteredNotifications = new ArrayList(); 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 filteredNotification = filterNewPostNotification((ListNotification) notification, currentSone, true); @@ -72,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 filteredNotification = filterNewReplyNotification((ListNotification) notification, currentSone); @@ -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) { @@ -243,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; } }