X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommand.java;h=821c198b3ba3e2ad3850e1bfa06aeb8524a81bc7;hp=bbff5ed3953ae67f69e1599e260a438ae890ddb3;hb=438378deab1514f0f608d975ef65f5b7aea44ccb;hpb=3d6cffe82270a1faacf1f0d39c34b11ab316e0db

diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
index bbff5ed..821c198 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,17 +28,13 @@ 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 freenet.support.api.Bucket;
 
 /**
  * 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 {
 
@@ -56,25 +52,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);
 
-		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);
 
-		List<Post> sortedPosts = new ArrayList<Post>(allPosts);
-		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
+		List<Post> sortedPosts = new ArrayList<>(allPosts);
+		Collections.sort(sortedPosts, Post.NEWEST_FIRST);
 
 		if (sortedPosts.size() < startPost) {
 			return new Response("PostFeed", encodePosts(Collections.<Post> emptyList(), "Posts.", false));