X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=4e2049eb1d7d06858850a4c9c246a9b05b38b4f0;hb=b72db16cd16e8bfbaadc44604bdff3f49a1aff51;hp=09a9d2b5600a73386ad0f3c1e62bdbc7cf3244fd;hpb=99202fc71976dda021446626a0147431e419299e;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 09a9d2b..4e2049e 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -66,10 +66,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) {
@@ -93,7 +102,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 +123,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);
 				}
 
 			});
@@ -170,7 +179,7 @@ public class GetStatusAjaxPage extends JsonPage {
 		synchronized (dateFormat) {
 			jsonSone.put("lastUpdated", dateFormat.format(new Date(sone.getTime())));
 		}
-		jsonSone.put("age", (System.currentTimeMillis() - sone.getTime()) / 1000);
+		jsonSone.put("lastUpdatedText", GetTimesAjaxPage.getTime(webInterface, System.currentTimeMillis() - sone.getTime()).getText());
 		return jsonSone;
 	}