X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=05c2349652083f09d5e77877568b2334ff014de7;hp=7b804fb037f8150d3194cd8db734bb99a3d79dbe;hb=HEAD;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae

diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
index 7b804fb..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–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
@@ -28,16 +28,16 @@ import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 
 import freenet.support.SimpleFieldSet;
 
+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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class GetPostFeedCommand extends AbstractSoneCommand {
 
@@ -60,20 +60,20 @@ public class GetPostFeedCommand extends AbstractSoneCommand {
 		int startPost = getInt(parameters, "StartPost", 0);
 		int maxPosts = getInt(parameters, "MaxPosts", -1);
 
-		Collection<Post> allPosts = new HashSet<Post>();
+		Collection<Post> allPosts = new HashSet<>();
 		allPosts.addAll(sone.getPosts());
 		for (String friendSoneId : sone.getFriends()) {
-			Optional<Sone> friendSone = getCore().getSone(friendSoneId);
-			if (!friendSone.isPresent()) {
+			Sone friendSone = getCore().getSone(friendSoneId);
+			if (friendSone == null) {
 				continue;
 			}
-			allPosts.addAll(friendSone.get().getPosts());
+			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<Post> sortedPosts = new ArrayList<Post>(allPosts);
-		Collections.sort(sortedPosts, Post.NEWEST_FIRST);
+		List<Post> sortedPosts = new ArrayList<>(allPosts);
+		sortedPosts.sort(newestPostFirst());
 
 		if (sortedPosts.size() < startPost) {
 			return new Response("PostFeed", encodePosts(Collections.<Post> emptyList(), "Posts.", false));