X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=781bed248785a89e8460f5df977499d0f77f10c4;hb=0acd68634f3e73c62087609c1faa2dfc53da506d;hp=895c1c6c05ffa04b97f7b4e6fa578169ac5ad4b1;hpb=96e4cdd1c5a2dc719afbf1f1cc14a3c62e93f432;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 895c1c6..781bed2 100644
--- 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–2012 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
@@ -27,7 +27,7 @@ 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 net.pterodactylus.util.collection.filter.Filters;
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
@@ -54,7 +54,7 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
 	 */
 	@Override
 	public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
-		Sone sone = getSone(parameters, "Sone");
+		Sone sone = getSone(parameters, "Sone", true);
 		int startPost = getInt(parameters, "StartPost", 0);
 		int maxPosts = getInt(parameters, "MaxPosts", -1);
 
@@ -64,7 +64,7 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
 			if (!getCore().hasSone(friendSoneId)) {
 				continue;
 			}
-			allPosts.addAll(getCore().getSone(friendSoneId).getPosts());
+			allPosts.addAll(getCore().getSone(friendSoneId, false).getPosts());
 		}
 		allPosts.addAll(getCore().getDirectedPosts(sone));
 		allPosts = Filters.filteredSet(allPosts, Post.FUTURE_POSTS_FILTER);
@@ -73,10 +73,10 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
 		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
 
 		if (sortedPosts.size() < startPost) {
-			return new Response(encodePosts(Collections.<Post> emptyList(), "Posts.", false));
+			return new Response("PostFeed", encodePosts(Collections.<Post> emptyList(), "Posts.", false));
 		}
 
-		return new Response(encodePosts(sortedPosts.subList(startPost, (maxPosts == -1) ? sortedPosts.size() : Math.min(startPost + maxPosts, sortedPosts.size())), "Posts.", true));
+		return new Response("PostFeed", encodePosts(sortedPosts.subList(startPost, (maxPosts == -1) ? sortedPosts.size() : Math.min(startPost + maxPosts, sortedPosts.size())), "Posts.", true));
 	}
 
 }