X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=223a79f257747e82936eb57a41824d91d1eef635;hp=eaa6506d2c52e39d3a315475c83f37a63c210ae6;hb=632116a9843914f931e6bc3e2d56a0b1961a4db9;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2

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 eaa6506..223a79f 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - GetStatusAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - GetStatusAjaxPage.java - Copyright © 2010–2012 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,17 +26,18 @@ import java.util.List;
 import java.util.Set;
 
 import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.PostReply;
 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.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.filter.Filter;
-import net.pterodactylus.util.filter.Filters;
+import net.pterodactylus.util.collection.filter.Filter;
+import net.pterodactylus.util.collection.filter.Filters;
 import net.pterodactylus.util.json.JsonArray;
 import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.notify.Notification;
+import net.pterodactylus.util.object.HashCode;
 
 /**
  * The “get status” AJAX handler returns all information that is necessary to
@@ -90,11 +91,8 @@ public class GetStatusAjaxPage extends JsonPage {
 		}
 		/* load notifications. */
 		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) {
-			jsonNotificationInformations.add(createJsonNotificationInformation(notification));
-		}
+		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
+		int notificationHash = HashCode.hashCode(notifications);
 		/* load new posts. */
 		Set<Post> newPosts = webInterface.getNewPosts();
 		if (currentSone != null) {
@@ -117,27 +115,27 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonPosts.add(jsonPost);
 		}
 		/* load new replies. */
-		Set<Reply> newReplies = webInterface.getNewReplies();
+		Set<PostReply> newReplies = webInterface.getNewReplies();
 		if (currentSone != null) {
-			newReplies = Filters.filteredSet(newReplies, new Filter<Reply>() {
+			newReplies = Filters.filteredSet(newReplies, new Filter<PostReply>() {
 
 				@Override
-				public boolean filterObject(Reply reply) {
+				public boolean filterObject(PostReply reply) {
 					return ListNotificationFilters.isReplyVisible(currentSone, reply);
 				}
 
 			});
 		}
 		/* remove replies to unknown posts. */
-		newReplies = Filters.filteredSet(newReplies, new Filter<Reply>() {
+		newReplies = Filters.filteredSet(newReplies, new Filter<PostReply>() {
 
 			@Override
-			public boolean filterObject(Reply reply) {
+			public boolean filterObject(PostReply reply) {
 				return (reply.getPost() != null) && (reply.getPost().getSone() != null);
 			}
 		});
 		JsonArray jsonReplies = new JsonArray();
-		for (Reply reply : newReplies) {
+		for (PostReply reply : newReplies) {
 			JsonObject jsonReply = new JsonObject();
 			jsonReply.put("id", reply.getId());
 			jsonReply.put("sone", reply.getSone().getId());
@@ -145,7 +143,7 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonReply.put("postSone", reply.getPost().getSone().getId());
 			jsonReplies.add(jsonReply);
 		}
-		return createSuccessJsonObject().put("loggedIn", currentSone != null).put("sones", jsonSones).put("notifications", jsonNotificationInformations).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
+		return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notificationHash).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**
@@ -180,7 +178,7 @@ public class GetStatusAjaxPage extends JsonPage {
 		jsonSone.put("id", sone.getId());
 		jsonSone.put("name", SoneAccessor.getNiceName(sone));
 		jsonSone.put("local", sone.getInsertUri() != null);
-		jsonSone.put("status", webInterface.getCore().getSoneStatus(sone).name());
+		jsonSone.put("status", sone.getStatus().name());
 		jsonSone.put("modified", webInterface.getCore().isModifiedSone(sone));
 		jsonSone.put("locked", webInterface.getCore().isLocked(sone));
 		jsonSone.put("lastUpdatedUnknown", sone.getTime() == 0);
@@ -192,21 +190,22 @@ public class GetStatusAjaxPage extends JsonPage {
 	}
 
 	/**
-	 * Creates a JSON object that only contains the ID and the last-updated time
-	 * of the given notification.
+	 * Creates a JSON object that contains all options that are currently in
+	 * effect for the given Sone (or overall, if the given Sone is {@code null}
+	 * ).
 	 *
-	 * @see Notification#getId()
-	 * @see Notification#getLastUpdatedTime()
-	 * @param notification
-	 *            The notification
-	 * @return A JSON object containing the notification ID and last-updated
-	 *         time
+	 * @param currentSone
+	 *            The current Sone (may be {@code null})
+	 * @return The current options
 	 */
-	private JsonObject createJsonNotificationInformation(Notification notification) {
-		JsonObject jsonNotification = new JsonObject();
-		jsonNotification.put("id", notification.getId());
-		jsonNotification.put("lastUpdatedTime", notification.getLastUpdatedTime());
-		return jsonNotification;
+	private JsonObject createJsonOptions(Sone currentSone) {
+		JsonObject options = new JsonObject();
+		if (currentSone != null) {
+			options.put("ShowNotification/NewSones", currentSone.getOptions().getBooleanOption("ShowNotification/NewSones").get());
+			options.put("ShowNotification/NewPosts", currentSone.getOptions().getBooleanOption("ShowNotification/NewPosts").get());
+			options.put("ShowNotification/NewReplies", currentSone.getOptions().getBooleanOption("ShowNotification/NewReplies").get());
+		}
+		return options;
 	}
 
 }