X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=efb67161f70582c77faf22a3abe05265b67e68d5;hb=128580ddb154ce7d4f12108a8a70a8fe12488ffe;hp=cc095a2ea391fa3dc1a09e664eb05d3518e5d534;hpb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;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 cc095a2..efb6716 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–2013 David Roden
+ * Sone - GetStatusAjaxPage.java - Copyright © 2010–2016 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
@@ -21,6 +21,7 @@ import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -31,8 +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.ListNotificationFilters;
+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;
@@ -40,8 +43,6 @@ 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.Predicate;
-import com.google.common.collect.Collections2;
 
 /**
  * The “get status” AJAX handler returns all information that is necessary to
@@ -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(getCurrentSoneWithoutCreatingSession(request.getToadletContext())));
 		String loadSoneIds = request.getHttpRequest().getParam("soneIds");
 		if (loadSoneIds.length() > 0) {
 			String[] soneIds = loadSoneIds.split(",");
@@ -88,20 +93,11 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonSones.add(createJsonSone(sone));
 		}
 		/* load notifications. */
-		List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone);
+		List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications(currentSone));
 		Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
 		/* load new posts. */
-		Collection<Post> newPosts = webInterface.getNewPosts();
-		if (currentSone != null) {
-			newPosts = Collections2.filter(newPosts, new Predicate<Post>() {
-
-				@Override
-				public boolean apply(Post post) {
-					return ListNotificationFilters.isPostVisible(currentSone, post);
-				}
+		Collection<Post> newPosts = webInterface.getNewPosts(getCurrentSoneWithoutCreatingSession(request.getToadletContext()));
 
-			});
-		}
 		ArrayNode jsonPosts = new ArrayNode(instance);
 		for (Post post : newPosts) {
 			ObjectNode jsonPost = new ObjectNode(instance);
@@ -112,19 +108,8 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonPosts.add(jsonPost);
 		}
 		/* load new replies. */
-		Collection<PostReply> newReplies = webInterface.getNewReplies();
-		if (currentSone != null) {
-			newReplies = Collections2.filter(newReplies, new Predicate<PostReply>() {
-
-				@Override
-				public boolean apply(PostReply reply) {
-					return ListNotificationFilters.isReplyVisible(currentSone, reply);
-				}
+		Collection<PostReply> newReplies = webInterface.getNewReplies(getCurrentSoneWithoutCreatingSession(request.getToadletContext()));
 
-			});
-		}
-		/* remove replies to unknown posts. */
-		newReplies = Collections2.filter(newReplies, PostReply.HAS_POST_FILTER);
 		ArrayNode jsonReplies = new ArrayNode(instance);
 		for (PostReply reply : newReplies) {
 			ObjectNode jsonReply = new ObjectNode(instance);
@@ -176,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;
 	}