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=fba51f9a1fcbcdb9379de5a8a8476b1101d8a735;hb=179e7da4d8d8a474d0b622d60b5f5d32d6ab4052;hpb=49a8ab6bd09b92822cd8cf1285c0b7a68e2bc8ca diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java index fba51f9..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–2016 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 @@ -30,14 +30,10 @@ 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 * values. - * - * @author David ‘Bombe’ Roden */ public class ReplyGroupFilter implements Filter { @@ -55,17 +51,17 @@ public class ReplyGroupFilter implements Filter { * All replies from a new-reply notification have posts, * ListNotificationFilters takes care of that. */ - Optional post = reply.getPost(); - Set sones = postSones.get(post.get()); + Post post = reply.getPost().get(); + Set sones = postSones.get(post); if (sones == null) { sones = new HashSet<>(); - postSones.put(post.get(), sones); + postSones.put(post, sones); } sones.add(reply.getSone()); - Set replies = postReplies.get(post.get()); + Set replies = postReplies.get(post); if (replies == null) { replies = new HashSet<>(); - postReplies.put(post.get(), replies); + postReplies.put(post, replies); } replies.add(reply); }