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=2ca7c236a25ea9c2bd9b031b0dcf771f2134c127;hp=659c8d259d3fe58c6aca7492692ea0536c36ffa3;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=d53a79eeb9531a08173431ce2ba19156eeca4a0c

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..2ca7c23 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–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,9 +17,12 @@
 
 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.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -27,14 +30,19 @@ 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.PostVisibilityFilter;
+import net.pterodactylus.sone.notify.ReplyVisibilityFilter;
 import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonArray;
-import net.pterodactylus.util.json.JsonObject;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 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;
+
 /**
  * The “get status” AJAX handler returns all information that is necessary to
  * update the web interface in real-time.
@@ -60,56 +68,53 @@ public class GetStatusAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
-		/* load Sones. */
-		boolean loadAllSones = Boolean.parseBoolean(request.getHttpRequest().getParam("loadAllSones", "true"));
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
+		final 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)));
-		if (loadAllSones) {
-			sones.addAll(webInterface.getCore().getSones());
+		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).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 = new ArrayList<Notification>(webInterface.getNotifications().getChangedNotifications());
-		Set<Notification> removedNotifications = webInterface.getNotifications().getRemovedNotifications();
-		Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER);
-		JsonArray jsonNotifications = new JsonArray();
-		for (Notification notification : notifications) {
-			jsonNotifications.add(createJsonNotification(notification));
-		}
-		JsonArray jsonRemovedNotifications = new JsonArray();
-		for (Notification notification : removedNotifications) {
-			jsonRemovedNotifications.add(createJsonNotification(notification));
-		}
+		List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications(currentSone));
+		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
 		/* load new posts. */
-		Set<Post> newPosts = webInterface.getNewPosts();
-		JsonArray jsonPosts = new JsonArray();
+		Collection<Post> newPosts = webInterface.getNewPosts(getCurrentSone(request.getToadletContext(), false));
+
+		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.getRecipient() != null) ? post.getRecipient().getId() : null);
+			jsonPost.put("recipient", post.getRecipientId().orNull());
 			jsonPost.put("time", post.getTime());
 			jsonPosts.add(jsonPost);
 		}
 		/* load new replies. */
-		Set<Reply> newReplies = webInterface.getNewReplies();
-		JsonArray jsonReplies = new JsonArray();
-		for (Reply reply : newReplies) {
-			JsonObject jsonReply = new JsonObject();
+		Collection<PostReply> newReplies = webInterface.getNewReplies(getCurrentSone(request.getToadletContext(), false));
+
+		ArrayNode jsonReplies = new ArrayNode(instance);
+		for (PostReply reply : newReplies) {
+			ObjectNode jsonReply = new ObjectNode(instance);
 			jsonReply.put("id", reply.getId());
 			jsonReply.put("sone", reply.getSone().getId());
-			jsonReply.put("post", reply.getPost().getId());
-			jsonReply.put("postSone", reply.getPost().getSone().getId());
+			jsonReply.put("post", reply.getPostId());
+			jsonReply.put("postSone", reply.getPost().get().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("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notifications.hashCode()).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**
@@ -139,36 +144,39 @@ 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);
-		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);
 		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, sone.getTime()).getText());
 		return jsonSone;
 	}
 
 	/**
-	 * Creates a JSON object from 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}
+	 * ).
 	 *
-	 * @param notification
-	 *            The notification to create a JSON object
-	 * @return The JSON object
+	 * @param currentSone
+	 *            The current Sone (may be {@code null})
+	 * @return The current options
 	 */
-	private static JsonObject createJsonNotification(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;
+	private static JsonNode createJsonOptions(Sone currentSone) {
+		ObjectNode options = new ObjectNode(instance);
+		if (currentSone != null) {
+			options.put("ShowNotification/NewSones", currentSone.getOptions().isShowNewSoneNotifications());
+			options.put("ShowNotification/NewPosts", currentSone.getOptions().isShowNewPostNotifications());
+			options.put("ShowNotification/NewReplies", currentSone.getOptions().isShowNewReplyNotifications());
+		}
+		return options;
 	}
 
 }