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=16bb133fd29fb8e863b2a6503fc08a0ceca3ddef;hp=5c9da19ab5c6d9080dd9f94293465f7b282dee11;hb=4314a29fdeb9766e198b7144a9724422d0df84dc;hpb=456687632b616e3ab55d58a39a3f499a059d0f5c 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 5c9da19..16bb133 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java @@ -92,11 +92,6 @@ public class GetStatusAjaxPage extends JsonPage { /* load notifications. */ List notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone); int notificationHash = HashCode.hashCode(notifications); - Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER); - JsonArray jsonNotificationInformations = new JsonArray(); - for (Notification notification : notifications) { - jsonNotificationInformations.add(createJsonNotificationInformation(notification)); - } /* load new posts. */ Set newPosts = webInterface.getNewPosts(); if (currentSone != null) { @@ -147,7 +142,7 @@ public class GetStatusAjaxPage extends JsonPage { jsonReply.put("postSone", reply.getPost().getSone().getId()); jsonReplies.add(jsonReply); } - return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notificationHash).put("notifications", jsonNotificationInformations).put("newPosts", jsonPosts).put("newReplies", jsonReplies); + return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notificationHash).put("newPosts", jsonPosts).put("newReplies", jsonReplies); } /** @@ -182,7 +177,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); @@ -194,24 +189,6 @@ public class GetStatusAjaxPage extends JsonPage { } /** - * Creates a JSON object that only contains the ID and the last-updated time - * of the given notification. - * - * @see Notification#getId() - * @see Notification#getLastUpdatedTime() - * @param notification - * The notification - * @return A JSON object containing the notification ID and last-updated - * time - */ - private JsonObject createJsonNotificationInformation(Notification notification) { - JsonObject jsonNotification = new JsonObject(); - jsonNotification.put("id", notification.getId()); - jsonNotification.put("lastUpdatedTime", notification.getLastUpdatedTime()); - return jsonNotification; - } - - /** * 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} * ).