X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=effbebe9f58ca99722a6aaf64a890c9f55256fad;hb=2288fe8a74e888e9d6a8b13ccbd322ca006c1cec;hp=8b1612b072925077200e19c586fe844ed3315aab;hpb=2a69c05787c49cdb8bf88a1d7e89226237f11d70;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 8b1612b..effbebe 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -22,6 +22,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -52,7 +53,7 @@ public class GetStatusAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public GetStatusAjaxPage(WebInterface webInterface) {
-		super("ajax/getStatus.ajax", webInterface);
+		super("getStatus.ajax", webInterface);
 	}
 
 	/**
@@ -62,9 +63,15 @@ public class GetStatusAjaxPage extends JsonPage {
 	protected JsonObject createJsonObject(Request request) {
 		/* load Sones. */
 		boolean loadAllSones = Boolean.parseBoolean(request.getHttpRequest().getParam("loadAllSones", "true"));
-		Set<Sone> sones = loadAllSones ? webInterface.getCore().getSones() : Collections.singleton(getCurrentSone(request.getToadletContext()));
+		Set<Sone> sones = new HashSet<Sone>(Collections.singleton(getCurrentSone(request.getToadletContext(), false)));
+		if (loadAllSones) {
+			sones.addAll(webInterface.getCore().getSones());
+		}
 		JsonArray jsonSones = new JsonArray();
 		for (Sone sone : sones) {
+			if (sone == null) {
+				continue;
+			}
 			JsonObject jsonSone = createJsonSone(sone);
 			jsonSones.add(jsonSone);
 		}
@@ -84,7 +91,11 @@ public class GetStatusAjaxPage extends JsonPage {
 		Set<Post> newPosts = webInterface.getNewPosts();
 		JsonArray jsonPosts = new JsonArray();
 		for (Post post : newPosts) {
-			jsonPosts.add(post.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);
+			jsonPosts.add(jsonPost);
 		}
 		/* load new replies. */
 		Set<Reply> newReplies = webInterface.getNewReplies();