X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetNotificationsAjaxPage.java;h=65d3943989d3a956b4eba9a3a17a877503ade5e8;hp=d88aae905f49bf02f37651a39f01714d0ca716a6;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=89e431b7cda6e2091bad97c9bfa2aa1b3f4409f0

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 d88aae9..65d3943 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–2016 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,24 +17,26 @@
 
 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.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import net.pterodactylus.sone.data.Sone;
 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;
+
 /**
  * AJAX handler to return all current notifications.
  *
@@ -76,17 +78,15 @@ public class GetNotificationsAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		Sone currentSone = getCurrentSone(request.getToadletContext(), false);
-		Collection<Notification> notifications = webInterface.getNotifications().getNotifications();
-		List<Notification> filteredNotifications = ListNotificationFilters.filterNotifications(notifications, currentSone);
-		Collections.sort(filteredNotifications, Notification.CREATED_TIME_SORTER);
-		int notificationHash = HashCode.hashCode(filteredNotifications);
-		JsonArray jsonNotifications = new JsonArray();
-		for (Notification notification : filteredNotifications) {
+		List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications(currentSone));
+		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
+		ArrayNode jsonNotifications = new ArrayNode(instance);
+		for (Notification notification : notifications) {
 			jsonNotifications.add(createJsonNotification(request, notification));
 		}
-		return createSuccessJsonObject().put("notificationHash", notificationHash).put("notifications", jsonNotifications).put("options", createJsonOptions(currentSone));
+		return createSuccessJsonObject().put("notificationHash", notifications.hashCode()).put("notifications", jsonNotifications).put("options", createJsonOptions(currentSone));
 	}
 
 	//
@@ -102,8 +102,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 {
@@ -113,7 +113,7 @@ public class GetNotificationsAjaxPage extends JsonPage {
 				templateContext.set("currentSone", webInterface.getCurrentSone(request.getToadletContext(), false));
 				templateContext.set("localSones", webInterface.getCore().getLocalSones());
 				templateContext.set("request", request);
-				templateContext.set("currentVersion", SonePlugin.VERSION);
+				templateContext.set("currentVersion", SonePlugin.getPluginVersion());
 				templateContext.set("hasLatestVersion", webInterface.getCore().getUpdateChecker().hasLatestVersion());
 				templateContext.set("latestEdition", webInterface.getCore().getUpdateChecker().getLatestEdition());
 				templateContext.set("latestVersion", webInterface.getCore().getUpdateChecker().getLatestVersion());
@@ -142,12 +142,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();
+	private static JsonNode createJsonOptions(Sone currentSone) {
+		ObjectNode options = new ObjectNode(instance);
 		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());
+			options.put("ShowNotification/NewSones", currentSone.getOptions().isShowNewSoneNotifications());
+			options.put("ShowNotification/NewPosts", currentSone.getOptions().isShowNewPostNotifications());
+			options.put("ShowNotification/NewReplies", currentSone.getOptions().isShowNewReplyNotifications());
 		}
 		return options;
 	}