X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=8197ba81f527cc89cc003cfcc43ab0772d0cf435;hb=ee39c03a6a811300728183552afcede1d9f8e79a;hp=4ee15e30aa6d00e7bf2d6369a34f0d86e6228299;hpb=6f1f26e3998cfef155b0cf59152827accea70d30;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 4ee15e3..8197ba8 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â2016 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
@@ -32,11 +32,11 @@ import com.google.common.collect.Collections2;
import freenet.support.SimpleFieldSet;
+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 {
@@ -59,7 +59,7 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
int startPost = getInt(parameters, "StartPost", 0);
int maxPosts = getInt(parameters, "MaxPosts", -1);
- Collection allPosts = new HashSet();
+ Collection allPosts = new HashSet<>();
allPosts.addAll(sone.getPosts());
for (String friendSoneId : sone.getFriends()) {
Sone friendSone = getCore().getSone(friendSoneId);
@@ -69,9 +69,9 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
allPosts.addAll(friendSone.getPosts());
}
allPosts.addAll(getCore().getDirectedPosts(sone.getId()));
- allPosts = Collections2.filter(allPosts, Post.FUTURE_POSTS_FILTER);
+ allPosts = Collections2.filter(allPosts, noFuturePost()::invoke);
- List sortedPosts = new ArrayList(allPosts);
+ List sortedPosts = new ArrayList<>(allPosts);
Collections.sort(sortedPosts, Post.NEWEST_FIRST);
if (sortedPosts.size() < startPost) {