X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=89a38584bf22b367c1861833deb4cafb668f557e;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=48b25d66430d42adf98313682d3424314a52d723;hpb=45803a1c678d6811f7bbf85d50c79844031be0f0;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 48b25d6..89a3858 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
@@ -33,10 +35,12 @@ 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.json.JsonArray;
-import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.notify.Notification;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 
@@ -65,10 +69,10 @@ public class GetStatusAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
-		final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
+		final Optional<Sone> currentSone = getCurrentSone(request.getToadletContext(), false);
 		/* load Sones. always return the status of the current Sone. */
-		Set<Sone> sones = new HashSet<Sone>(Collections.singleton(getCurrentSone(request.getToadletContext(), false)));
+		Set<Sone> sones = new HashSet<Sone>(currentSone.asSet());
 		String loadSoneIds = request.getHttpRequest().getParam("soneIds");
 		if (loadSoneIds.length() > 0) {
 			String[] soneIds = loadSoneIds.split(",");
@@ -77,32 +81,31 @@ public class GetStatusAjaxPage extends JsonPage {
 				sones.add(webInterface.getCore().getSone(soneId).orNull());
 			}
 		}
-		JsonArray jsonSones = new JsonArray();
+		ArrayNode jsonSones = new ArrayNode(instance);
 		for (Sone sone : sones) {
 			if (sone == null) {
 				continue;
 			}
-			JsonObject jsonSone = createJsonSone(sone);
-			jsonSones.add(jsonSone);
+			jsonSones.add(createJsonSone(sone));
 		}
 		/* load notifications. */
-		List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone);
+		List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone.orNull());
 		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
 		/* load new posts. */
 		Collection<Post> newPosts = webInterface.getNewPosts();
-		if (currentSone != null) {
+		if (currentSone.isPresent()) {
 			newPosts = Collections2.filter(newPosts, new Predicate<Post>() {
 
 				@Override
 				public boolean apply(Post post) {
-					return ListNotificationFilters.isPostVisible(currentSone, post);
+					return ListNotificationFilters.isPostVisible(currentSone.get(), post);
 				}
 
 			});
 		}
-		JsonArray jsonPosts = new JsonArray();
+		ArrayNode jsonPosts = new ArrayNode(instance);
 		for (Post post : newPosts) {
-			JsonObject jsonPost = new JsonObject();
+			ObjectNode jsonPost = new ObjectNode(instance);
 			jsonPost.put("id", post.getId());
 			jsonPost.put("sone", post.getSone().getId());
 			jsonPost.put("recipient", post.getRecipientId().orNull());
@@ -111,28 +114,28 @@ public class GetStatusAjaxPage extends JsonPage {
 		}
 		/* load new replies. */
 		Collection<PostReply> newReplies = webInterface.getNewReplies();
-		if (currentSone != null) {
+		if (currentSone.isPresent()) {
 			newReplies = Collections2.filter(newReplies, new Predicate<PostReply>() {
 
 				@Override
 				public boolean apply(PostReply reply) {
-					return ListNotificationFilters.isReplyVisible(currentSone, reply);
+					return ListNotificationFilters.isReplyVisible(currentSone.get(), reply);
 				}
 
 			});
 		}
 		/* remove replies to unknown posts. */
 		newReplies = Collections2.filter(newReplies, PostReply.HAS_POST_FILTER);
-		JsonArray jsonReplies = new JsonArray();
+		ArrayNode jsonReplies = new ArrayNode(instance);
 		for (PostReply reply : newReplies) {
-			JsonObject jsonReply = new JsonObject();
+			ObjectNode jsonReply = new ObjectNode(instance);
 			jsonReply.put("id", reply.getId());
 			jsonReply.put("sone", reply.getSone().getId());
 			jsonReply.put("post", reply.getPostId());
 			jsonReply.put("postSone", reply.getPost().get().getSone().getId());
 			jsonReplies.add(jsonReply);
 		}
-		return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notifications.hashCode()).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
+		return createSuccessJsonObject().put("loggedIn", currentSone.isPresent()).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notifications.hashCode()).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**
@@ -162,8 +165,8 @@ public class GetStatusAjaxPage extends JsonPage {
 	 *            The Sone to convert to a JSON object
 	 * @return The JSON representation of the given Sone
 	 */
-	private JsonObject createJsonSone(Sone sone) {
-		JsonObject jsonSone = new JsonObject();
+	private JsonNode createJsonSone(Sone sone) {
+		ObjectNode jsonSone = new ObjectNode(instance);
 		jsonSone.put("id", sone.getId());
 		jsonSone.put("name", SoneAccessor.getNiceName(sone));
 		jsonSone.put("local", sone.getInsertUri() != null);
@@ -187,12 +190,12 @@ public class GetStatusAjaxPage extends JsonPage {
 	 *            The current Sone (may be {@code null})
 	 * @return The current options
 	 */
-	private static 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());
+	private static JsonNode createJsonOptions(Optional<Sone> currentSone) {
+		ObjectNode options = new ObjectNode(instance);
+		if (currentSone.isPresent()) {
+			options.put("ShowNotification/NewSones", currentSone.get().getOptions().isShowNewSoneNotifications());
+			options.put("ShowNotification/NewPosts", currentSone.get().getOptions().isShowNewPostNotifications());
+			options.put("ShowNotification/NewReplies", currentSone.get().getOptions().isShowNewReplyNotifications());
 		}
 		return options;
 	}