Refactoring.

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

diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
index d4b175c..970e301 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
@@ -1,5 +1,5 @@
 /*
- * Sone - GetPostFeedCommand.java - Copyright © 2011 David Roden
+ * Sone - GetPostFeedCommand.java - Copyright © 2011–2013 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
@@ -17,17 +17,20 @@
 
 package net.pterodactylus.sone.fcp;
 
-import java.util.ArrayList;
+import static com.google.common.base.Optional.presentInstances;
+import static com.google.common.collect.FluentIterable.from;
+import static net.pterodactylus.sone.data.Sone.TO_POSTS;
+
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
-import net.pterodactylus.util.filter.Filters;
+
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
@@ -49,34 +52,27 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
                super(core);
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
-               Sone sone = getSone(parameters, "Sone", true);
+               Sone sone = getMandatoryLocalSone(parameters, "Sone");
                int startPost = getInt(parameters, "StartPost", 0);
                int maxPosts = getInt(parameters, "MaxPosts", -1);
 
-               Set<Post> allPosts = new HashSet<Post>();
-               allPosts.addAll(sone.getPosts());
-               for (String friendSoneId : sone.getFriends()) {
-                       if (!getCore().hasSone(friendSoneId)) {
-                               continue;
-                       }
-                       allPosts.addAll(getCore().getSone(friendSoneId).getPosts());
-               }
-               allPosts.addAll(getCore().getDirectedPosts(sone));
-               allPosts = Filters.filteredSet(allPosts, Post.FUTURE_POSTS_FILTER);
-
-               List<Post> sortedPosts = new ArrayList<Post>(allPosts);
-               Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
+               List<Post> sortedPosts = from(collectAllPostsForSone(sone)).filter(Post.FUTURE_POSTS_FILTER).toSortedList(Post.TIME_COMPARATOR);
 
                if (sortedPosts.size() < startPost) {
-                       return new Response("PostFeed", encodePosts(Collections.<Post> emptyList(), "Posts.", false));
+                       return new Response("PostFeed", encodePosts(Collections.<Post>emptyList(), "Posts."));
                }
 
-               return new Response("PostFeed", encodePosts(sortedPosts.subList(startPost, (maxPosts == -1) ? sortedPosts.size() : Math.min(startPost + maxPosts, sortedPosts.size())), "Posts.", true));
+               return new Response("PostFeed", encodePostsWithReplies(sortedPosts.subList(startPost, (maxPosts == -1) ? sortedPosts.size() : Math.min(startPost + maxPosts, sortedPosts.size())), "Posts."));
+       }
+
+       private Collection<Post> collectAllPostsForSone(Sone sone) {
+               Collection<Post> allPosts = new HashSet<Post>();
+               allPosts.addAll(sone.getPosts());
+               allPosts.addAll(from(presentInstances(from(sone.getFriends()).transform(getCore().getDatabase().getSone()))).transformAndConcat(TO_POSTS).toList());
+               allPosts.addAll(getCore().getDatabase().getDirectedPosts(sone.getId()));
+               return allPosts;
        }
 
 }