X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=bb59a8da87e57eb4358adae98b6a333a1f3072ab;hb=464fee6c08c68ad2b5f76ad5d9d32fcd545713c6;hp=e43910cb143290bde30446ec80b7a9c931a8d043;hpb=629ddb006542df2b671e172d8f544815bbab639b;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 e43910c..bb59a8d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -21,6 +21,7 @@ import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -33,6 +34,7 @@ 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.utils.Optionals;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.notify.Notification;
@@ -40,8 +42,10 @@ 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;
+import com.google.common.collect.FluentIterable;
 
 /**
  * The “get status” AJAX handler returns all information that is necessary to
@@ -69,35 +73,33 @@ public class GetStatusAjaxPage extends JsonPage {
 	 */
 	@Override
 	protected JsonReturnObject createJsonObject(FreenetRequest request) {
-		final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
+		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(",");
-			for (String soneId : soneIds) {
-				/* just add it, we skip null further down. */
-				sones.add(webInterface.getCore().getSone(soneId).orNull());
-			}
+			FluentIterable.from(Arrays.asList(soneIds))
+					.transform(webInterface.getCore().soneLoader())
+					.filter(Optionals.isPresent())
+					.transform(Optionals.<Sone>get())
+					.copyInto(sones);
 		}
 		ArrayNode jsonSones = new ArrayNode(instance);
 		for (Sone sone : sones) {
-			if (sone == null) {
-				continue;
-			}
 			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);
 				}
 
 			});
@@ -113,12 +115,12 @@ 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);
 				}
 
 			});
@@ -134,7 +136,7 @@ public class GetStatusAjaxPage extends JsonPage {
 			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);
 	}
 
 	/**
@@ -189,12 +191,12 @@ public class GetStatusAjaxPage extends JsonPage {
 	 *            The current Sone (may be {@code null})
 	 * @return The current options
 	 */
-	private static JsonNode createJsonOptions(Sone currentSone) {
+	private static JsonNode createJsonOptions(Optional<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());
+		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;
 	}