Use already existing variable for current Sone

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / GetStatusAjaxPage.java

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 2ca7c23..45c1cee 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -32,9 +32,10 @@ import java.util.Set;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.notify.PostVisibilityFilter;
-import net.pterodactylus.sone.notify.ReplyVisibilityFilter;
+import net.pterodactylus.sone.freenet.L10nFilter;
 import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.sone.text.TimeText;
+import net.pterodactylus.sone.text.TimeTextConverter;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.notify.Notification;
@@ -53,6 +54,8 @@ public class GetStatusAjaxPage extends JsonPage {
 
        /** Date formatter. */
        private static final DateFormat dateFormat = new SimpleDateFormat("MMM d, yyyy, HH:mm:ss");
+       private final TimeTextConverter timeTextConverter;
+       private final L10nFilter l10nFilter;
 
        /**
         * Creates a new “get status” AJAX handler.
@@ -60,8 +63,10 @@ public class GetStatusAjaxPage extends JsonPage {
         * @param webInterface
         *            The Sone web interface
         */
-       public GetStatusAjaxPage(WebInterface webInterface) {
+       public GetStatusAjaxPage(WebInterface webInterface, TimeTextConverter timeTextConverter, L10nFilter l10nFilter) {
                super("getStatus.ajax", webInterface);
+               this.timeTextConverter = timeTextConverter;
+               this.l10nFilter = l10nFilter;
        }
 
        /**
@@ -69,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<Sone> sones = new HashSet<Sone>(Collections.singleton(getCurrentSone(request.getToadletContext(), false)));
+               Set<Sone> sones = new HashSet<Sone>(Collections.singleton(currentSone));
                String loadSoneIds = request.getHttpRequest().getParam("soneIds");
                if (loadSoneIds.length() > 0) {
                        String[] soneIds = loadSoneIds.split(",");
@@ -91,7 +96,7 @@ public class GetStatusAjaxPage extends JsonPage {
                List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications(currentSone));
                Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
                /* load new posts. */
-               Collection<Post> newPosts = webInterface.getNewPosts(getCurrentSone(request.getToadletContext(), false));
+               Collection<Post> newPosts = webInterface.getNewPosts(currentSone);
 
                ArrayNode jsonPosts = new ArrayNode(instance);
                for (Post post : newPosts) {
@@ -103,7 +108,7 @@ public class GetStatusAjaxPage extends JsonPage {
                        jsonPosts.add(jsonPost);
                }
                /* load new replies. */
-               Collection<PostReply> newReplies = webInterface.getNewReplies(getCurrentSone(request.getToadletContext(), false));
+               Collection<PostReply> newReplies = webInterface.getNewReplies(currentSone);
 
                ArrayNode jsonReplies = new ArrayNode(instance);
                for (PostReply reply : newReplies) {
@@ -148,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));
@@ -156,7 +161,8 @@ public class GetStatusAjaxPage extends JsonPage {
                synchronized (dateFormat) {
                        jsonSone.put("lastUpdated", dateFormat.format(new Date(sone.getTime())));
                }
-               jsonSone.put("lastUpdatedText", GetTimesAjaxPage.getTime(webInterface, sone.getTime()).getText());
+               TimeText timeText = timeTextConverter.getTimeText(sone.getTime());
+               jsonSone.put("lastUpdatedText", l10nFilter.format(null, timeText.getL10nText(), Collections.<String, Object>emptyMap()));
                return jsonSone;
        }