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=89a38584bf22b367c1861833deb4cafb668f557e;hp=cc095a2ea391fa3dc1a09e664eb05d3518e5d534;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hpb=1a2c9eb50e89d9ba5f9ea9b72721ebfeb68650cd

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 cc095a2..89a3858 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -40,6 +40,7 @@ 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;
 
@@ -69,9 +70,9 @@ 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(",");
@@ -88,16 +89,16 @@ public class GetStatusAjaxPage extends JsonPage {
 			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 +114,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 +135,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 +190,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().isShowNewSoneNotifications());
-			options.put("ShowNotification/NewPosts", currentSone.getOptions().isShowNewPostNotifications());
-			options.put("ShowNotification/NewReplies", currentSone.getOptions().isShowNewReplyNotifications());
+		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;
 	}