projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🔀 Merge branch 'release/v82'
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
fcp
/
GetPostFeedCommand.java
diff --git
a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java
index
1e2ca7d
..
05c2349
100644
(file)
--- 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–20
16
David Roden
+ * Sone - GetPostFeedCommand.java - Copyright © 2011–20
20
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
*
* 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,9
@@
import com.google.common.collect.Collections2;
import freenet.support.SimpleFieldSet;
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.
/**
* Implementation of an FCP interface for other clients or plugins to
* communicate with Sone.
@@
-57,7
+60,7
@@
public class GetPostFeedCommand extends AbstractSoneCommand {
int startPost = getInt(parameters, "StartPost", 0);
int maxPosts = getInt(parameters, "MaxPosts", -1);
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()) {
Sone friendSone = getCore().getSone(friendSoneId);
allPosts.addAll(sone.getPosts());
for (String friendSoneId : sone.getFriends()) {
Sone friendSone = getCore().getSone(friendSoneId);
@@
-67,10
+70,10
@@
public class GetPostFeedCommand extends AbstractSoneCommand {
allPosts.addAll(friendSone.getPosts());
}
allPosts.addAll(getCore().getDirectedPosts(sone.getId()));
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));
if (sortedPosts.size() < startPost) {
return new Response("PostFeed", encodePosts(Collections.<Post> emptyList(), "Posts.", false));