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=1e2ca7d6858fc8a92b0aebb0133febaadc6e094f;hpb=62573c314957b1851f4fbe693b8746686caa940a;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 1e2ca7d..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,6 +32,8 @@ 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. @@ -57,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); @@ -67,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) {