X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fnotify%2FListNotificationFilter.java;h=739907cc04607ffe66c3e15f2741a26b90c33036;hp=f3c93053c5feaad8cbb7d28a3937713ffd8a0a20;hb=HEAD;hpb=d36aa88de57f1492db61e3f6cb4daeeceab1904e

diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilter.java b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilter.java
index f3c9305..739907c 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–2020 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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 @Singleton
 public class ListNotificationFilter {
@@ -67,7 +65,7 @@ public class ListNotificationFilter {
 	 */
 	@SuppressWarnings("unchecked")
 	public List<Notification> filterNotifications(Collection<? extends Notification> notifications, Sone currentSone) {
-		List<Notification> filteredNotifications = new ArrayList<Notification>();
+		List<Notification> filteredNotifications = new ArrayList<>();
 		for (Notification notification : notifications) {
 			if (notification.getId().equals("new-sone-notification")) {
 				if ((currentSone != null) && !currentSone.getOptions().isShowNewSoneNotifications()) {
@@ -81,7 +79,7 @@ public class ListNotificationFilter {
 				if (!currentSone.getOptions().isShowNewPostNotifications()) {
 					continue;
 				}
-				Optional<ListNotification<Post>> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, currentSone);
+				Optional<ListNotification<Post>> filteredNotification = filterPostNotification((ListNotification<Post>) 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<ListNotification<Post>> filteredNotification = filterNewPostNotification((ListNotification<Post>) notification, null);
+				Optional<ListNotification<Post>> filteredNotification = filterPostNotification((ListNotification<Post>) 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<ListNotification<Post>> filterNewPostNotification(@Nonnull ListNotification<Post> postNotification,
+	private Optional<ListNotification<Post>> filterPostNotification(@Nonnull ListNotification<Post> postNotification,
 			@Nullable Sone currentSone) {
 		List<Post> newPosts = from(postNotification.getElements()).filter(postVisibilityFilter.isVisible(currentSone)).toList();
 		if (newPosts.isEmpty()) {
@@ -128,7 +126,7 @@ public class ListNotificationFilter {
 		if (newPosts.size() == postNotification.getElements().size()) {
 			return Optional.of(postNotification);
 		}
-		ListNotification<Post> filteredNotification = new ListNotification<Post>(postNotification);
+		ListNotification<Post> filteredNotification = new ListNotification<>(postNotification);
 		filteredNotification.setElements(newPosts);
 		filteredNotification.setLastUpdateTime(postNotification.getLastUpdatedTime());
 		return Optional.of(filteredNotification);
@@ -157,7 +155,7 @@ public class ListNotificationFilter {
 		if (newReplies.size() == newReplyNotification.getElements().size()) {
 			return Optional.of(newReplyNotification);
 		}
-		ListNotification<PostReply> filteredNotification = new ListNotification<PostReply>(newReplyNotification);
+		ListNotification<PostReply> filteredNotification = new ListNotification<>(newReplyNotification);
 		filteredNotification.setElements(newReplies);
 		filteredNotification.setLastUpdateTime(newReplyNotification.getLastUpdatedTime());
 		return Optional.of(filteredNotification);