X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FReplyGroupFilter.java;h=c093e6fe01969fc665954909d38e9997470433f7;hp=ff4b64e1fbcc0166b8f0ca4e51e53428b317a5f0;hb=179e7da4d8d8a474d0b622d60b5f5d32d6ab4052;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772

diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
index ff4b64e..c093e6f 100644
--- a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ReplyGroupFilter.java - Copyright © 2010–2012 David Roden
+ * Sone - ReplyGroupFilter.java - Copyright © 2010–2019 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
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import net.pterodactylus.sone.data.Post;
@@ -33,8 +34,6 @@ import net.pterodactylus.util.template.TemplateContext;
  * {@link Filter} implementation that groups replies by the post the are in
  * reply to, returning a map with the post as key and the list of replies as
  * values.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class ReplyGroupFilter implements Filter {
 
@@ -45,32 +44,33 @@ public class ReplyGroupFilter implements Filter {
 	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
 		@SuppressWarnings("unchecked")
 		List<PostReply> allReplies = (List<PostReply>) data;
-		Map<Post, Set<Sone>> postSones = new HashMap<Post, Set<Sone>>();
-		Map<Post, Set<PostReply>> postReplies = new HashMap<Post, Set<PostReply>>();
+		Map<Post, Set<Sone>> postSones = new HashMap<>();
+		Map<Post, Set<PostReply>> postReplies = new HashMap<>();
 		for (PostReply reply : allReplies) {
-			Post post = reply.getPost();
+			/*
+			 * All replies from a new-reply notification have posts,
+			 * ListNotificationFilters takes care of that.
+			 */
+			Post post = reply.getPost().get();
 			Set<Sone> sones = postSones.get(post);
 			if (sones == null) {
-				sones = new HashSet<Sone>();
+				sones = new HashSet<>();
 				postSones.put(post, sones);
 			}
 			sones.add(reply.getSone());
 			Set<PostReply> replies = postReplies.get(post);
 			if (replies == null) {
-				replies = new HashSet<PostReply>();
+				replies = new HashSet<>();
 				postReplies.put(post, replies);
 			}
 			replies.add(reply);
 		}
-		Map<Post, Map<String, Set<?>>> result = new HashMap<Post, Map<String, Set<?>>>();
-		for (Post post : postSones.keySet()) {
-			if (result.containsKey(post)) {
-				continue;
-			}
-			Map<String, Set<?>> postResult = new HashMap<String, Set<?>>();
-			postResult.put("sones", postSones.get(post));
-			postResult.put("replies", postReplies.get(post));
-			result.put(post, postResult);
+		Map<Post, Map<String, Set<?>>> result = new HashMap<>();
+		for (Entry<Post, Set<Sone>> postEntry : postSones.entrySet()) {
+			Map<String, Set<?>> postResult = new HashMap<>();
+			postResult.put("sones", postEntry.getValue());
+			postResult.put("replies", postReplies.get(postEntry.getKey()));
+			result.put(postEntry.getKey(), postResult);
 		}
 		return result;
 	}