X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FReplyGroupFilter.java;h=709ffbc26f0834386abbeb5bcd638ba2e3544b1b;hp=8bc17a7f6e061d96eacc4f1f9a1f2640e0d89cda;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=54e35873a9660bc51aae7cdb4c1e7d399e50986b

diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
index 8bc17a7..709ffbc 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 David Roden
+ * Sone - ReplyGroupFilter.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
@@ -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;
@@ -29,6 +30,8 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.base.Optional;
+
 /**
  * {@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
@@ -42,35 +45,39 @@ public class ReplyGroupFilter implements Filter {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
+	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>>();
 		for (PostReply reply : allReplies) {
-			Post post = reply.getPost();
-			Set<Sone> sones = postSones.get(post);
+			/*
+			 * All replies from a new-reply notification have posts,
+			 * ListNotificationFilters takes care of that.
+			 */
+			Optional<Post> post = reply.getPost();
+			Set<Sone> sones = postSones.get(post.get());
 			if (sones == null) {
 				sones = new HashSet<Sone>();
-				postSones.put(post, sones);
+				postSones.put(post.get(), sones);
 			}
 			sones.add(reply.getSone());
-			Set<PostReply> replies = postReplies.get(post);
+			Set<PostReply> replies = postReplies.get(post.get());
 			if (replies == null) {
 				replies = new HashSet<PostReply>();
-				postReplies.put(post, replies);
+				postReplies.put(post.get(), 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)) {
+		for (Entry<Post, Set<Sone>> postEntry : postSones.entrySet()) {
+			if (result.containsKey(postEntry.getKey())) {
 				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);
+			postResult.put("sones", postEntry.getValue());
+			postResult.put("replies", postReplies.get(postEntry.getKey()));
+			result.put(postEntry.getKey(), postResult);
 		}
 		return result;
 	}