projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log exception when a JSON reply can not be generated.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
GetStatusAjaxPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
index
e69aa12
..
48b25d6
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@
-74,7
+74,7
@@
public class GetStatusAjaxPage extends JsonPage {
String[] soneIds = loadSoneIds.split(",");
for (String soneId : soneIds) {
/* just add it, we skip null further down. */
String[] soneIds = loadSoneIds.split(",");
for (String soneId : soneIds) {
/* just add it, we skip null further down. */
- sones.add(webInterface.getCore().getSone(soneId
, false
));
+ sones.add(webInterface.getCore().getSone(soneId
).orNull(
));
}
}
JsonArray jsonSones = new JsonArray();
}
}
JsonArray jsonSones = new JsonArray();
@@
-105,7
+105,7
@@
public class GetStatusAjaxPage extends JsonPage {
JsonObject jsonPost = new JsonObject();
jsonPost.put("id", post.getId());
jsonPost.put("sone", post.getSone().getId());
JsonObject jsonPost = new JsonObject();
jsonPost.put("id", post.getId());
jsonPost.put("sone", post.getSone().getId());
- jsonPost.put("recipient",
(post.getRecipient() != null) ? post.getRecipient().getId() : null
);
+ jsonPost.put("recipient",
post.getRecipientId().orNull()
);
jsonPost.put("time", post.getTime());
jsonPosts.add(jsonPost);
}
jsonPost.put("time", post.getTime());
jsonPosts.add(jsonPost);
}
@@
-122,13
+122,7
@@
public class GetStatusAjaxPage extends JsonPage {
});
}
/* remove replies to unknown posts. */
});
}
/* remove replies to unknown posts. */
- newReplies = Collections2.filter(newReplies, new Predicate<PostReply>() {
-
- @Override
- public boolean apply(PostReply reply) {
- return (reply.getPost() != null) && (reply.getPost().getSone() != null);
- }
- });
+ newReplies = Collections2.filter(newReplies, PostReply.HAS_POST_FILTER);
JsonArray jsonReplies = new JsonArray();
for (PostReply reply : newReplies) {
JsonObject jsonReply = new JsonObject();
JsonArray jsonReplies = new JsonArray();
for (PostReply reply : newReplies) {
JsonObject jsonReply = new JsonObject();