X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=05c2349652083f09d5e77877568b2334ff014de7;hb=23e09dfc13a0cc6dfc7d7b8cc09c78acc6984ec7;hp=4c07359ac822fb8c4da241093134436ff11f3a99;hpb=ba4811ca5360e93b449629132b4c6583aa82eb1a;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 4c07359..05c2349 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â2020 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,24 +18,26 @@
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;
+
+import static net.pterodactylus.sone.data.PostKt.newestPostFirst;
+import static net.pterodactylus.sone.data.PostKt.noFuturePost;
/**
* Implementation of an FCP interface for other clients or plugins to
* communicate with Sone.
- *
- * @author David âBombeâ Roden
*/
public class GetPostFeedCommand extends AbstractSoneCommand {
@@ -53,24 +55,25 @@ 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);
- Set allPosts = new HashSet();
+ 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 = Filters.filteredSet(allPosts, Post.FUTURE_POSTS_FILTER);
+ allPosts.addAll(getCore().getDirectedPosts(sone.getId()));
+ allPosts = Collections2.filter(allPosts, noFuturePost()::invoke);
- List sortedPosts = new ArrayList(allPosts);
- Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
+ List sortedPosts = new ArrayList<>(allPosts);
+ sortedPosts.sort(newestPostFirst());
if (sortedPosts.size() < startPost) {
return new Response("PostFeed", encodePosts(Collections. emptyList(), "Posts.", false));