X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilter.java;h=5db5258a5287bed27507fb3d46aa83e873d38c49;hb=62573c314957b1851f4fbe693b8746686caa940a;hp=f3c93053c5feaad8cbb7d28a3937713ffd8a0a20;hpb=d36aa88de57f1492db61e3f6cb4daeeceab1904e;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilter.java b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilter.java index f3c9305..5db5258 100644 --- a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilter.java +++ b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilter.java @@ -1,5 +1,5 @@ /* - * Sone - ListNotificationFilters.java - Copyright © 2010–2015 David Roden + * Sone - ListNotificationFilter.java - Copyright © 2010–2016 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 @@ -36,8 +36,6 @@ import com.google.common.base.Optional; /** * Filter for {@link ListNotification}s. - * - * @author David ‘Bombe’ Roden */ @Singleton public class ListNotificationFilter { @@ -81,7 +79,7 @@ public class ListNotificationFilter { if (!currentSone.getOptions().isShowNewPostNotifications()) { continue; } - Optional> filteredNotification = filterNewPostNotification((ListNotification) notification, currentSone); + Optional> filteredNotification = filterPostNotification((ListNotification) notification, currentSone); if (filteredNotification.isPresent()) { filteredNotifications.add(filteredNotification.get()); } @@ -98,7 +96,7 @@ public class ListNotificationFilter { filteredNotifications.add(filteredNotification.get()); } } else if (notification.getId().equals("mention-notification")) { - Optional> filteredNotification = filterNewPostNotification((ListNotification) notification, null); + Optional> filteredNotification = filterPostNotification((ListNotification) notification, null); if (filteredNotification.isPresent()) { filteredNotifications.add(filteredNotification.get()); } @@ -119,7 +117,7 @@ public class ListNotificationFilter { * @return The filtered post notification, or {@link Optional#absent()} if the notification should be removed */ @Nonnull - private Optional> filterNewPostNotification(@Nonnull ListNotification postNotification, + private Optional> filterPostNotification(@Nonnull ListNotification postNotification, @Nullable Sone currentSone) { List newPosts = from(postNotification.getElements()).filter(postVisibilityFilter.isVisible(currentSone)).toList(); if (newPosts.isEmpty()) {