X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilters.java;h=8a423c2c8b9db40e3823199e56f09795e21e8da3;hb=9f562b1024a26cd8841447c6e29c3d89039d7a22;hp=3db8912779cc570907468a118a4ac00155f3da64;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;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 3db8912..8a423c2 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 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 @@ -17,17 +17,21 @@ 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; import net.pterodactylus.sone.data.Post; +import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.data.Reply; 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; + +import com.google.common.base.Optional; /** * Filter for {@link ListNotification}s. @@ -54,20 +58,31 @@ public class ListNotificationFilters { public static List filterNotifications(Collection notifications, Sone currentSone) { List filteredNotifications = new ArrayList(); for (Notification notification : notifications) { - if (notification.getId().equals("new-post-notification")) { - ListNotification filteredNotification = filterNewPostNotification((ListNotification) notification, currentSone, true); - if (filteredNotification != null) { - filteredNotifications.add(filteredNotification); + if (notification.getId().equals("new-sone-notification")) { + if ((currentSone != null) && !currentSone.getOptions().isShowNewSoneNotifications()) { + continue; + } + filteredNotifications.add(notification); + } else if (notification.getId().equals("new-post-notification")) { + if ((currentSone != null) && !currentSone.getOptions().isShowNewPostNotifications()) { + continue; + } + Optional> filteredNotification = filterNewPostNotification((ListNotification) notification, currentSone, true); + if (filteredNotification.isPresent()) { + filteredNotifications.add(filteredNotification.get()); } } else if (notification.getId().equals("new-reply-notification")) { - ListNotification filteredNotification = filterNewReplyNotification((ListNotification) notification, currentSone); - if (filteredNotification != null) { - filteredNotifications.add(filteredNotification); + if ((currentSone != null) && !currentSone.getOptions().isShowNewReplyNotifications()) { + continue; + } + Optional> filteredNotification = filterNewReplyNotification((ListNotification) notification, currentSone); + if (filteredNotification.isPresent()) { + filteredNotifications.add(filteredNotification.get()); } } else if (notification.getId().equals("mention-notification")) { - ListNotification filteredNotification = filterNewPostNotification((ListNotification) notification, null, false); - if (filteredNotification != null) { - filteredNotifications.add(filteredNotification); + Optional> filteredNotification = filterNewPostNotification((ListNotification) notification, null, false); + if (filteredNotification.isPresent()) { + filteredNotifications.add(filteredNotification.get()); } } else { filteredNotifications.add(notification); @@ -93,9 +108,9 @@ public class ListNotificationFilters { * @return The filtered new-post notification, or {@code null} if the * notification should be removed */ - public static ListNotification filterNewPostNotification(ListNotification newPostNotification, Sone currentSone, boolean soneRequired) { + private static Optional> filterNewPostNotification(ListNotification newPostNotification, Sone currentSone, boolean soneRequired) { if (soneRequired && (currentSone == null)) { - return null; + return Optional.absent(); } List newPosts = new ArrayList(); for (Post post : newPostNotification.getElements()) { @@ -104,15 +119,15 @@ public class ListNotificationFilters { } } if (newPosts.isEmpty()) { - return null; + return Optional.absent(); } if (newPosts.size() == newPostNotification.getElements().size()) { - return newPostNotification; + return Optional.of(newPostNotification); } ListNotification filteredNotification = new ListNotification(newPostNotification); filteredNotification.setElements(newPosts); filteredNotification.setLastUpdateTime(newPostNotification.getLastUpdatedTime()); - return filteredNotification; + return Optional.of(filteredNotification); } /** @@ -129,26 +144,49 @@ public class ListNotificationFilters { * @return The filtered new-reply notification, or {@code null} if the * notification should be removed */ - public static ListNotification filterNewReplyNotification(ListNotification newReplyNotification, Sone currentSone) { + private static Optional> filterNewReplyNotification(ListNotification newReplyNotification, Sone currentSone) { if (currentSone == null) { - return null; + return Optional.absent(); } - List newReplies = new ArrayList(); - for (Reply reply : newReplyNotification.getElements()) { + List newReplies = new ArrayList(); + for (PostReply reply : newReplyNotification.getElements()) { if (isReplyVisible(currentSone, reply)) { newReplies.add(reply); } } if (newReplies.isEmpty()) { - return null; + return Optional.absent(); } if (newReplies.size() == newReplyNotification.getElements().size()) { - return newReplyNotification; + return Optional.of(newReplyNotification); } - ListNotification filteredNotification = new ListNotification(newReplyNotification); + ListNotification filteredNotification = new ListNotification(newReplyNotification); filteredNotification.setElements(newReplies); filteredNotification.setLastUpdateTime(newReplyNotification.getLastUpdatedTime()); - return filteredNotification; + return Optional.of(filteredNotification); + } + + /** + * Filters the given posts, using {@link #isPostVisible(Sone, Post)} to + * decide whether a post should be contained in the returned list. If + * {@code currentSone} is not {@code null} it is used to filter out posts + * that are from Sones that are not followed or not trusted by the given + * Sone. + * + * @param posts + * The posts to filter + * @param currentSone + * The current Sone (may be {@code null}) + * @return The filtered posts + */ + public static List filterPosts(Collection posts, Sone currentSone) { + List filteredPosts = new ArrayList(); + for (Post post : posts) { + if (isPostVisible(currentSone, post)) { + filteredPosts.add(post); + } + } + return filteredPosts; } /** @@ -183,11 +221,11 @@ public class ListNotificationFilters { * otherwise */ public static boolean isPostVisible(Sone sone, Post post) { - Validation.begin().isNotNull("Post", post).check(); - Sone postSone = post.getSone(); - if (postSone == null) { + checkNotNull(post, "post must not be null"); + if (!post.isLoaded()) { return false; } + Sone postSone = post.getSone(); if (sone != null) { Trust trust = postSone.getIdentity().getTrust((OwnIdentity) sone.getIdentity()); if (trust != null) { @@ -198,16 +236,19 @@ 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. + */ } - 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; } } - if (post.getTime() > System.currentTimeMillis()) { - return false; - } - return true; + return post.getTime() <= System.currentTimeMillis(); } /** @@ -237,19 +278,16 @@ public class ListNotificationFilters { * @return {@code true} if the reply is considered visible, {@code false} * otherwise */ - public static boolean isReplyVisible(Sone sone, Reply reply) { - Validation.begin().isNotNull("Reply", reply).check(); - Post post = reply.getPost(); - if (post == null) { - return false; - } - if (!isPostVisible(sone, post)) { + public static boolean isReplyVisible(Sone sone, PostReply reply) { + checkNotNull(reply, "reply must not be null"); + Optional post = reply.getPost(); + if (!post.isPresent()) { return false; } - if (reply.getTime() > System.currentTimeMillis()) { + if (!isPostVisible(sone, post.get())) { return false; } - return true; + return reply.getTime() <= System.currentTimeMillis(); } }