X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetNotificationsAjaxPage.java;h=d86e5a85229b02d38a174025f459042703286717;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=d0020ca78ef94313c487a2355f62867c65cc673e;hpb=8b576ec955d0c3a7d6e57326438b532afe40aa0f;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
index d0020ca..d86e5a8 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - GetNotificationsAjaxPage.java - Copyright © 2011 David Roden
+ * Sone - GetNotificationsAjaxPage.java - Copyright © 2011–2013 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
@@ -17,9 +17,12 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import net.pterodactylus.sone.data.Sone;
@@ -27,13 +30,15 @@ import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.sone.notify.ListNotificationFilters;
 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 net.pterodactylus.util.notify.TemplateNotification;
-import net.pterodactylus.util.object.HashCode;
 import net.pterodactylus.util.template.TemplateContext;
 
+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;
+
 /**
  * AJAX handler to return all current notifications.
  *
@@ -75,16 +80,16 @@ public class GetNotificationsAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
-		Sone currentSone = getCurrentSone(request.getToadletContext(), false);
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
+		Optional<Sone> currentSone = getCurrentSone(request.getToadletContext(), false);
 		Collection<Notification> notifications = webInterface.getNotifications().getNotifications();
-		List<Notification> filteredNotifications = ListNotificationFilters.filterNotifications(notifications, currentSone);
-		int notificationHash = HashCode.hashCode(filteredNotifications);
-		JsonArray jsonNotifications = new JsonArray();
+		List<Notification> filteredNotifications = ListNotificationFilters.filterNotifications(notifications, currentSone.orNull());
+		Collections.sort(filteredNotifications, Notification.CREATED_TIME_SORTER);
+		ArrayNode jsonNotifications = new ArrayNode(instance);
 		for (Notification notification : filteredNotifications) {
 			jsonNotifications.add(createJsonNotification(request, notification));
 		}
-		return createSuccessJsonObject().put("notificationHash", notificationHash).put("notifications", jsonNotifications).put("options", createJsonOptions(currentSone));
+		return createSuccessJsonObject().put("notificationHash", filteredNotifications.hashCode()).put("notifications", jsonNotifications).put("options", createJsonOptions(currentSone));
 	}
 
 	//
@@ -100,8 +105,8 @@ public class GetNotificationsAjaxPage extends JsonPage {
 	 *            The notification to create a JSON object
 	 * @return The JSON object
 	 */
-	private JsonObject createJsonNotification(FreenetRequest request, Notification notification) {
-		JsonObject jsonNotification = new JsonObject();
+	private JsonNode createJsonNotification(FreenetRequest request, Notification notification) {
+		ObjectNode jsonNotification = new ObjectNode(instance);
 		jsonNotification.put("id", notification.getId());
 		StringWriter notificationWriter = new StringWriter();
 		try {
@@ -140,12 +145,12 @@ public class GetNotificationsAjaxPage extends JsonPage {
 	 *            The current Sone (may be {@code null})
 	 * @return The current options
 	 */
-	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());
+	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;
 	}