X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=1e2ca7d6858fc8a92b0aebb0133febaadc6e094f;hb=62573c314957b1851f4fbe693b8746686caa940a;hp=5f2fd14d45f000c9a9c2e77648afe50a8c306edf;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;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 5f2fd14..1e2ca7d 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â2013 David Roden
+ * Sone - GetPostFeedCommand.java - Copyright © 2011â2016 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
@@ -31,13 +31,10 @@ import net.pterodactylus.sone.freenet.fcp.FcpException;
import com.google.common.collect.Collections2;
import freenet.support.SimpleFieldSet;
-import freenet.support.api.Bucket;
/**
* Implementation of an FCP interface for other clients or plugins to
* communicate with Sone.
- *
- * @author David âBombeâ Roden
*/
public class GetPostFeedCommand extends AbstractSoneCommand {
@@ -55,7 +52,7 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
* {@inheritDoc}
*/
@Override
- public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
+ public Response execute(SimpleFieldSet parameters) throws FcpException {
Sone sone = getSone(parameters, "Sone", true);
int startPost = getInt(parameters, "StartPost", 0);
int maxPosts = getInt(parameters, "MaxPosts", -1);
@@ -63,16 +60,17 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
Collection allPosts = new HashSet();
allPosts.addAll(sone.getPosts());
for (String friendSoneId : sone.getFriends()) {
- if (!getCore().hasSone(friendSoneId)) {
+ Sone friendSone = getCore().getSone(friendSoneId);
+ if (friendSone == null) {
continue;
}
- allPosts.addAll(getCore().getSone(friendSoneId, false).getPosts());
+ allPosts.addAll(friendSone.getPosts());
}
- allPosts.addAll(getCore().getDirectedPosts(sone));
+ allPosts.addAll(getCore().getDirectedPosts(sone.getId()));
allPosts = Collections2.filter(allPosts, Post.FUTURE_POSTS_FILTER);
List sortedPosts = new ArrayList(allPosts);
- Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
+ Collections.sort(sortedPosts, Post.NEWEST_FIRST);
if (sortedPosts.size() < startPost) {
return new Response("PostFeed", encodePosts(Collections. emptyList(), "Posts.", false));