X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=0fc7eda031e381cdaf55e82acb19cdb8f7514821;hp=d4b175c92e7a601ff9298538733e41a7647f1917;hb=d535f744751ba449e0f34fe3a42f1020988f14be;hpb=58ba9d9a5ac37dc2e08d3d0bce762b3f93bc8de8

diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
index d4b175c..0fc7eda 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–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
@@ -18,16 +18,18 @@
 package net.pterodactylus.sone.fcp;
 
 import java.util.ArrayList;
+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 com.google.common.collect.Collections2;
+
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
@@ -58,7 +60,7 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
 		int startPost = getInt(parameters, "StartPost", 0);
 		int maxPosts = getInt(parameters, "MaxPosts", -1);
 
-		Set<Post> allPosts = new HashSet<Post>();
+		Collection<Post> allPosts = new HashSet<Post>();
 		allPosts.addAll(sone.getPosts());
 		for (String friendSoneId : sone.getFriends()) {
 			if (!getCore().hasSone(friendSoneId)) {
@@ -66,8 +68,8 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
 			}
 			allPosts.addAll(getCore().getSone(friendSoneId).getPosts());
 		}
-		allPosts.addAll(getCore().getDirectedPosts(sone));
-		allPosts = Filters.filteredSet(allPosts, Post.FUTURE_POSTS_FILTER);
+		allPosts.addAll(getCore().getDirectedPosts(sone.getId()));
+		allPosts = Collections2.filter(allPosts, Post.FUTURE_POSTS_FILTER);
 
 		List<Post> sortedPosts = new ArrayList<Post>(allPosts);
 		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);