X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=48b25d66430d42adf98313682d3424314a52d723;hb=6e9a43ccd93ae125720547c0fe421dc81a54ba90;hp=25c87133113e2b26a6e2ae9be1c01258028805bc;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;p=Sone.git

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 25c8713..48b25d6 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -36,7 +36,6 @@ import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.json.JsonArray;
 import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.notify.Notification;
-import net.pterodactylus.util.object.HashCode;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
@@ -75,7 +74,7 @@ public class GetStatusAjaxPage extends JsonPage {
 			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();
@@ -89,7 +88,6 @@ public class GetStatusAjaxPage extends JsonPage {
 		/* load notifications. */
 		List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone);
 		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
-		int notificationHash = HashCode.hashCode(notifications);
 		/* load new posts. */
 		Collection<Post> newPosts = webInterface.getNewPosts();
 		if (currentSone != null) {
@@ -107,7 +105,7 @@ public class GetStatusAjaxPage extends JsonPage {
 			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);
 		}
@@ -124,23 +122,17 @@ public class GetStatusAjaxPage extends JsonPage {
 			});
 		}
 		/* 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();
 			jsonReply.put("id", reply.getId());
 			jsonReply.put("sone", reply.getSone().getId());
-			jsonReply.put("post", reply.getPost().getId());
-			jsonReply.put("postSone", reply.getPost().getSone().getId());
+			jsonReply.put("post", reply.getPostId());
+			jsonReply.put("postSone", reply.getPost().get().getSone().getId());
 			jsonReplies.add(jsonReply);
 		}
-		return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notificationHash).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
+		return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notifications.hashCode()).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**