X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=8e0ac1e730c11b47cbb7faf57570c49d77df6ebf;hb=14bcfdd073d7ae75ae77bc112e38b29aee243411;hp=7a4c391f36dfe2392a4f6a2eb0143644d2295f87;hpb=4cedb9eb2dc06e707223d39651b6f2bc2e18de0b;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 7a4c391..8e0ac1e 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java @@ -74,9 +74,9 @@ public class GetStatusAjaxPage extends JsonPage { */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { - final Sone currentSone = getCurrentSone(request.getToadletContext(), false); + final Sone currentSone = getCurrentSoneWithoutCreatingSession(request.getToadletContext()); /* load Sones. always return the status of the current Sone. */ - Set sones = new HashSet(Collections.singleton(getCurrentSone(request.getToadletContext(), false))); + Set sones = new HashSet(Collections.singleton(getCurrentSoneWithoutCreatingSession(request.getToadletContext()))); String loadSoneIds = request.getHttpRequest().getParam("soneIds"); if (loadSoneIds.length() > 0) { String[] soneIds = loadSoneIds.split(","); @@ -96,7 +96,7 @@ public class GetStatusAjaxPage extends JsonPage { List notifications = new ArrayList(webInterface.getNotifications(currentSone)); Collections.sort(notifications, Notification.CREATED_TIME_SORTER); /* load new posts. */ - Collection newPosts = webInterface.getNewPosts(getCurrentSone(request.getToadletContext(), false)); + Collection newPosts = webInterface.getNewPosts(getCurrentSoneWithoutCreatingSession(request.getToadletContext())); ArrayNode jsonPosts = new ArrayNode(instance); for (Post post : newPosts) { @@ -108,7 +108,7 @@ public class GetStatusAjaxPage extends JsonPage { jsonPosts.add(jsonPost); } /* load new replies. */ - Collection newReplies = webInterface.getNewReplies(getCurrentSone(request.getToadletContext(), false)); + Collection newReplies = webInterface.getNewReplies(getCurrentSoneWithoutCreatingSession(request.getToadletContext())); ArrayNode jsonReplies = new ArrayNode(instance); for (PostReply reply : newReplies) { @@ -153,7 +153,7 @@ public class GetStatusAjaxPage extends JsonPage { ObjectNode jsonSone = new ObjectNode(instance); jsonSone.put("id", sone.getId()); jsonSone.put("name", SoneAccessor.getNiceName(sone)); - jsonSone.put("local", sone.getInsertUri() != null); + jsonSone.put("local", sone.isLocal()); jsonSone.put("status", sone.getStatus().name()); jsonSone.put("modified", webInterface.getCore().isModifiedSone(sone)); jsonSone.put("locked", webInterface.getCore().isLocked(sone));