X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=970e301a6e018d79794ad118411ae7ae10577af3;hb=e01ceeed92f226bf74c9f516bce882b5cd816a62;hp=f842ac4a5365ba47a07fe77eb80c58f5d31846a9;hpb=7f024734546973cd592e6cbf04604705477f15f6;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
index f842ac4..970e301 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
@@ -17,7 +17,10 @@
 
 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;
@@ -28,8 +31,6 @@ import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
 
-import com.google.common.collect.Collections2;
-
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
@@ -51,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);
 
-		Collection<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 = Collections2.filter(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;
 	}
 
 }