Add parameter to include replies in encodePosts().

[Sone.git] / src / main / java / net / pterodactylus / sone / fcp / AbstractSoneCommand.java

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index a8d8514..4ad6389 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@ -21,12 +21,14 @@ import java.util.Collection;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
 import net.pterodactylus.sone.freenet.fcp.AbstractCommand;
 import net.pterodactylus.sone.freenet.fcp.Command;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
 import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.util.filter.Filters;
 import freenet.node.FSParseException;
 import freenet.support.SimpleFieldSet;
 
@@ -122,9 +124,12 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *
         * @param posts
         *            The posts to encode
+        * @param includeReplies
+        *            {@code true} to include the replies, {@code false} to not
+        *            include the replies
         * @return The simple field set containing the posts
         */
-       public SimpleFieldSet encodePosts(Collection<? extends Post> posts) {
+       public SimpleFieldSet encodePosts(Collection<? extends Post> posts, boolean includeReplies) {
                SimpleFieldSetBuilder postBuilder = new SimpleFieldSetBuilder();
 
                int postIndex = 0;
@@ -138,9 +143,38 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
                        }
                        postBuilder.put(postPrefix + ".Time", post.getTime());
                        postBuilder.put(postPrefix + ".Text", post.getText());
+                       if (includeReplies) {
+                               postBuilder.put(encodeReplies(Filters.filteredList(core.getReplies(post), Reply.FUTURE_REPLIES_FILTER), postPrefix + "."));
+                       }
                }
 
                return postBuilder.get();
        }
 
+       /**
+        * Creates a simple field set from the given collection of replies.
+        *
+        * @param replies
+        *            The replies to encode
+        * @param prefix
+        *            The prefix for the field names (may be empty, but not
+        *            {@code null})
+        * @return The simple field set containing the replies
+        */
+       public SimpleFieldSet encodeReplies(Collection<? extends Reply> replies, String prefix) {
+               SimpleFieldSetBuilder replyBuilder = new SimpleFieldSetBuilder();
+
+               int replyIndex = 0;
+               replyBuilder.put(prefix + "Replies.Count", replies.size());
+               for (Reply reply : replies) {
+                       String replyPrefix = prefix + "Replies." + replyIndex++;
+                       replyBuilder.put(replyPrefix + ".ID", reply.getId());
+                       replyBuilder.put(replyPrefix + ".Sone", reply.getSone().getId());
+                       replyBuilder.put(replyPrefix + ".Time", reply.getTime());
+                       replyBuilder.put(replyPrefix + ".Text", reply.getText());
+               }
+
+               return replyBuilder.get();
+       }
+
 }