X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=8657a6a97060f27a51a8336996ce86759392b99d;hb=274784c1ae880b7cdc2bb7cf31d75e4092ec5653;hp=038cfb8854a5adfc368edfddc88c3a6fc00ccf5f;hpb=43a21f859e9fec31096c1540148bdd44a8e3702f;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 038cfb8..8657a6a 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–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 @@ -19,6 +19,7 @@ package net.pterodactylus.sone.web.ajax; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashSet; @@ -32,12 +33,13 @@ import net.pterodactylus.sone.notify.ListNotificationFilters; import net.pterodactylus.sone.template.SoneAccessor; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; -import net.pterodactylus.util.filter.Filter; -import net.pterodactylus.util.filter.Filters; import net.pterodactylus.util.json.JsonArray; import net.pterodactylus.util.json.JsonObject; import net.pterodactylus.util.notify.Notification; +import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; + /** * The “get status” AJAX handler returns all information that is necessary to * update the web interface in real-time. @@ -65,19 +67,14 @@ public class GetStatusAjaxPage extends JsonPage { @Override protected JsonObject createJsonObject(FreenetRequest request) { final Sone currentSone = getCurrentSone(request.getToadletContext(), false); - /* load Sones. */ - boolean loadAllSones = Boolean.parseBoolean(request.getHttpRequest().getParam("loadAllSones", "false")); + /* load Sones. always return the status of the current Sone. */ Set sones = new HashSet(Collections.singleton(getCurrentSone(request.getToadletContext(), false))); - if (loadAllSones) { - sones.addAll(webInterface.getCore().getSones()); - } else { - 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, false)); - } + 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, false)); } } JsonArray jsonSones = new JsonArray(); @@ -90,18 +87,14 @@ public class GetStatusAjaxPage extends JsonPage { } /* load notifications. */ List notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone); - Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER); - JsonArray jsonNotificationInformations = new JsonArray(); - for (Notification notification : notifications) { - jsonNotificationInformations.add(createJsonNotificationInformation(notification)); - } + Collections.sort(notifications, Notification.CREATED_TIME_SORTER); /* load new posts. */ - Set newPosts = webInterface.getNewPosts(); + Collection newPosts = webInterface.getNewPosts(); if (currentSone != null) { - newPosts = Filters.filteredSet(newPosts, new Filter() { + newPosts = Collections2.filter(newPosts, new Predicate() { @Override - public boolean filterObject(Post post) { + public boolean apply(Post post) { return ListNotificationFilters.isPostVisible(currentSone, post); } @@ -117,22 +110,22 @@ public class GetStatusAjaxPage extends JsonPage { jsonPosts.add(jsonPost); } /* load new replies. */ - Set newReplies = webInterface.getNewReplies(); + Collection newReplies = webInterface.getNewReplies(); if (currentSone != null) { - newReplies = Filters.filteredSet(newReplies, new Filter() { + newReplies = Collections2.filter(newReplies, new Predicate() { @Override - public boolean filterObject(PostReply reply) { + public boolean apply(PostReply reply) { return ListNotificationFilters.isReplyVisible(currentSone, reply); } }); } /* remove replies to unknown posts. */ - newReplies = Filters.filteredSet(newReplies, new Filter() { + newReplies = Collections2.filter(newReplies, new Predicate() { @Override - public boolean filterObject(PostReply reply) { + public boolean apply(PostReply reply) { return (reply.getPost() != null) && (reply.getPost().getSone() != null); } }); @@ -145,7 +138,7 @@ public class GetStatusAjaxPage extends JsonPage { jsonReply.put("postSone", reply.getPost().getSone().getId()); jsonReplies.add(jsonReply); } - return createSuccessJsonObject().put("loggedIn", currentSone != null).put("sones", jsonSones).put("notifications", jsonNotificationInformations).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); } /** @@ -180,7 +173,7 @@ public class GetStatusAjaxPage extends JsonPage { 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); @@ -192,21 +185,22 @@ public class GetStatusAjaxPage extends JsonPage { } /** - * Creates a JSON object that only contains the ID and the last-updated time - * of 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} + * ). * - * @see Notification#getId() - * @see Notification#getLastUpdatedTime() - * @param notification - * The notification - * @return A JSON object containing the notification ID and last-updated - * time + * @param currentSone + * The current Sone (may be {@code null}) + * @return The current options */ - private JsonObject createJsonNotificationInformation(Notification notification) { - JsonObject jsonNotification = new JsonObject(); - jsonNotification.put("id", notification.getId()); - jsonNotification.put("lastUpdatedTime", notification.getLastUpdatedTime()); - return jsonNotification; + private static 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()); + } + return options; } }