X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=dbaf189d5b2bb80f6461bbc6c2ed94c6bb02b907;hb=30ef483c663ded175b66b50b652a0497e04bd493;hp=d4b175c92e7a601ff9298538733e41a7647f1917;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;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 d4b175c..dbaf189 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,20 @@
 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.LocalSone;
 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.base.Optional;
+import com.google.common.collect.Collections2;
+
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
@@ -54,20 +58,21 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
 	 */
 	@Override
 	public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
-		Sone sone = getSone(parameters, "Sone", true);
+		LocalSone sone = getLocalSone(parameters, "Sone", true).get();
 		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)) {
+			Optional<Sone> friendSone = getCore().getSone(friendSoneId);
+			if (!friendSone.isPresent()) {
 				continue;
 			}
-			allPosts.addAll(getCore().getSone(friendSoneId).getPosts());
+			allPosts.addAll(friendSone.get().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);