X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=07fdfa87dccf3e299f3a58813d1dc59d78ce0389;hb=701569d76dbf1916125d5cf81fb2b65c6976d6d7;hp=7d581d7bd7050f85d8fe723cd908f6e03de5915d;hpb=ac926296e54cb3387e5772fceda9fa20b25d6711;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 7d581d7..07fdfa8 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -19,7 +19,6 @@ package net.pterodactylus.sone.web.ajax;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -66,10 +65,19 @@ public class GetStatusAjaxPage extends JsonPage {
 	protected JsonObject createJsonObject(Request request) {
 		final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
 		/* load Sones. */
-		boolean loadAllSones = Boolean.parseBoolean(request.getHttpRequest().getParam("loadAllSones", "true"));
+		boolean loadAllSones = Boolean.parseBoolean(request.getHttpRequest().getParam("loadAllSones", "false"));
 		Set<Sone> sones = new HashSet<Sone>(Collections.singleton(getCurrentSone(request.getToadletContext(), false)));
 		if (loadAllSones) {
 			sones.addAll(webInterface.getCore().getSones());
+		} else {
+			String loadSoneIds = request.getHttpRequest().getParam("soneIds");
+			if (loadSoneIds.length() > 0) {
+				String[] soneIds = loadSoneIds.split(",");
+				for (String soneId : soneIds) {
+					/* just add it, we skip null further down. */
+					sones.add(webInterface.getCore().getSone(soneId, false));
+				}
+			}
 		}
 		JsonArray jsonSones = new JsonArray();
 		for (Sone sone : sones) {
@@ -80,7 +88,7 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonSones.add(jsonSone);
 		}
 		/* load notifications. */
-		List<Notification> notifications = ListNotificationFilters.filterNotifications(new ArrayList<Notification>(webInterface.getNotifications().getNotifications()), currentSone);
+		List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone);
 		Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER);
 		JsonArray jsonNotificationInformations = new JsonArray();
 		for (Notification notification : notifications) {
@@ -93,7 +101,7 @@ public class GetStatusAjaxPage extends JsonPage {
 
 				@Override
 				public boolean filterObject(Post post) {
-					return currentSone.hasFriend(post.getSone().getId()) || currentSone.equals(post.getSone()) || currentSone.equals(post.getRecipient());
+					return ListNotificationFilters.isPostVisible(currentSone, post);
 				}
 
 			});
@@ -114,7 +122,7 @@ public class GetStatusAjaxPage extends JsonPage {
 
 				@Override
 				public boolean filterObject(Reply reply) {
-					return currentSone.hasFriend(reply.getPost().getSone().getId()) || currentSone.equals(reply.getPost().getSone()) || currentSone.equals(reply.getPost().getRecipient());
+					return ListNotificationFilters.isReplyVisible(currentSone, reply);
 				}
 
 			});
@@ -128,7 +136,7 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonReply.put("postSone", reply.getPost().getSone().getId());
 			jsonReplies.add(jsonReply);
 		}
-		return createSuccessJsonObject().put("sones", jsonSones).put("notifications", jsonNotificationInformations).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
+		return createSuccessJsonObject().put("loggedIn", currentSone != null).put("sones", jsonSones).put("notifications", jsonNotificationInformations).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**