X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=09b6f40758b0a480845db6eac73b9e6649fe5443;hb=7a24783f89a56c8570b3efc010561e02430c097f;hp=659c8d259d3fe58c6aca7492692ea0536c36ffa3;hpb=76e7a20f5212d9c202dbe92e958834ce3f99bd0e;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 659c8d2..09b6f40 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;
@@ -29,8 +28,11 @@ import java.util.Set;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
 import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.web.WebInterface;
+import net.pterodactylus.util.filter.Filter;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.json.JsonArray;
 import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.notify.Notification;
@@ -61,11 +63,21 @@ public class GetStatusAjaxPage extends JsonPage {
 	 */
 	@Override
 	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) {
@@ -76,19 +88,24 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonSones.add(jsonSone);
 		}
 		/* load notifications. */
-		List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications().getChangedNotifications());
-		Set<Notification> removedNotifications = webInterface.getNotifications().getRemovedNotifications();
+		List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone);
 		Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER);
-		JsonArray jsonNotifications = new JsonArray();
+		JsonArray jsonNotificationInformations = new JsonArray();
 		for (Notification notification : notifications) {
-			jsonNotifications.add(createJsonNotification(notification));
-		}
-		JsonArray jsonRemovedNotifications = new JsonArray();
-		for (Notification notification : removedNotifications) {
-			jsonRemovedNotifications.add(createJsonNotification(notification));
+			jsonNotificationInformations.add(createJsonNotificationInformation(notification));
 		}
 		/* load new posts. */
 		Set<Post> newPosts = webInterface.getNewPosts();
+		if (currentSone != null) {
+			newPosts = Filters.filteredSet(newPosts, new Filter<Post>() {
+
+				@Override
+				public boolean filterObject(Post post) {
+					return ListNotificationFilters.isPostVisible(currentSone, post);
+				}
+
+			});
+		}
 		JsonArray jsonPosts = new JsonArray();
 		for (Post post : newPosts) {
 			JsonObject jsonPost = new JsonObject();
@@ -100,6 +117,16 @@ public class GetStatusAjaxPage extends JsonPage {
 		}
 		/* load new replies. */
 		Set<Reply> newReplies = webInterface.getNewReplies();
+		if (currentSone != null) {
+			newReplies = Filters.filteredSet(newReplies, new Filter<Reply>() {
+
+				@Override
+				public boolean filterObject(Reply reply) {
+					return ListNotificationFilters.isReplyVisible(currentSone, reply);
+				}
+
+			});
+		}
 		JsonArray jsonReplies = new JsonArray();
 		for (Reply reply : newReplies) {
 			JsonObject jsonReply = new JsonObject();
@@ -109,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", jsonNotifications).put("removedNotifications", jsonRemovedNotifications).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
+		return createSuccessJsonObject().put("sones", jsonSones).put("notifications", jsonNotificationInformations).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**
@@ -147,27 +174,29 @@ public class GetStatusAjaxPage extends JsonPage {
 		jsonSone.put("status", webInterface.getCore().getSoneStatus(sone).name());
 		jsonSone.put("modified", webInterface.getCore().isModifiedSone(sone));
 		jsonSone.put("locked", webInterface.getCore().isLocked(sone));
+		jsonSone.put("lastUpdatedUnknown", sone.getTime() == 0);
 		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;
 	}
 
 	/**
-	 * Creates a JSON object from the given notification.
+	 * Creates a JSON object that only contains the ID and the last-updated time
+	 * of the given notification.
 	 *
+	 * @see Notification#getId()
+	 * @see Notification#getLastUpdatedTime()
 	 * @param notification
-	 *            The notification to create a JSON object
-	 * @return The JSON object
+	 *            The notification
+	 * @return A JSON object containing the notification ID and last-updated
+	 *         time
 	 */
-	private static JsonObject createJsonNotification(Notification notification) {
+	private JsonObject createJsonNotificationInformation(Notification notification) {
 		JsonObject jsonNotification = new JsonObject();
 		jsonNotification.put("id", notification.getId());
-		jsonNotification.put("text", notification.toString());
-		jsonNotification.put("createdTime", notification.getCreatedTime());
 		jsonNotification.put("lastUpdatedTime", notification.getLastUpdatedTime());
-		jsonNotification.put("dismissable", notification.isDismissable());
 		return jsonNotification;
 	}