projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🔖 Set version to 81
[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
7b804fb
..
821c198
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
@@
-28,7
+28,6
@@
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.fcp.FcpException;
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 com.google.common.collect.Collections2;
import freenet.support.SimpleFieldSet;
@@
-36,8
+35,6
@@
import freenet.support.SimpleFieldSet;
/**
* 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.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public class GetPostFeedCommand extends AbstractSoneCommand {
*/
public class GetPostFeedCommand extends AbstractSoneCommand {
@@
-60,19
+57,19
@@
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()) {
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;
}
continue;
}
- allPosts.addAll(friendSone.get
().get
Posts());
+ allPosts.addAll(friendSone.getPosts());
}
allPosts.addAll(getCore().getDirectedPosts(sone.getId()));
allPosts = Collections2.filter(allPosts, Post.FUTURE_POSTS_FILTER);
}
allPosts.addAll(getCore().getDirectedPosts(sone.getId()));
allPosts = Collections2.filter(allPosts, Post.FUTURE_POSTS_FILTER);
- List<Post> sortedPosts = new ArrayList<
Post
>(allPosts);
+ List<Post> sortedPosts = new ArrayList<>(allPosts);
Collections.sort(sortedPosts, Post.NEWEST_FIRST);
if (sortedPosts.size() < startPost) {
Collections.sort(sortedPosts, Post.NEWEST_FIRST);
if (sortedPosts.size() < startPost) {