X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=69d831dab01c78d6dfde11032086f1bae741436c;hb=34a27eaf3ada56df55934d7f83864f9cd2b17797;hp=71cc156e3c6d28d4efc59f1a0c392151c666c8b5;hpb=9e4db46b86d084eba9029906e779ec1d96f78ac4;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 71cc156..69d831d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -31,12 +31,16 @@ import java.util.Set;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
 import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.web.WebInterface;
+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 net.pterodactylus.util.notify.TemplateNotification;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * The “get status” AJAX handler returns all information that is necessary to
@@ -64,6 +68,7 @@ public class GetStatusAjaxPage extends JsonPage {
 	 */
 	@Override
 	protected JsonObject createJsonObject(Request request) {
+		final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
 		/* load Sones. */
 		boolean loadAllSones = Boolean.parseBoolean(request.getHttpRequest().getParam("loadAllSones", "true"));
 		Set<Sone> sones = new HashSet<Sone>(Collections.singleton(getCurrentSone(request.getToadletContext(), false)));
@@ -79,19 +84,24 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonSones.add(jsonSone);
 		}
 		/* load notifications. */
-		List<Notification> notifications = new ArrayList<Notification>(webInterface.getNotifications().getChangedNotifications());
-		Set<Notification> removedNotifications = webInterface.getNotifications().getRemovedNotifications();
+		List<Notification> notifications = ListNotificationFilters.filterNotifications(new ArrayList<Notification>(webInterface.getNotifications().getNotifications()), currentSone);
 		Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER);
 		JsonArray jsonNotifications = new JsonArray();
 		for (Notification notification : notifications) {
 			jsonNotifications.add(createJsonNotification(notification));
 		}
-		JsonArray jsonRemovedNotifications = new JsonArray();
-		for (Notification notification : removedNotifications) {
-			jsonRemovedNotifications.add(createJsonNotification(notification));
-		}
 		/* load new posts. */
 		Set<Post> newPosts = webInterface.getNewPosts();
+		if (currentSone != null) {
+			newPosts = Filters.filteredSet(newPosts, new Filter<Post>() {
+
+				@Override
+				public boolean filterObject(Post post) {
+					return currentSone.hasFriend(post.getSone().getId()) || currentSone.equals(post.getSone());
+				}
+
+			});
+		}
 		JsonArray jsonPosts = new JsonArray();
 		for (Post post : newPosts) {
 			JsonObject jsonPost = new JsonObject();
@@ -103,6 +113,16 @@ public class GetStatusAjaxPage extends JsonPage {
 		}
 		/* load new replies. */
 		Set<Reply> newReplies = webInterface.getNewReplies();
+		if (currentSone != null) {
+			newReplies = Filters.filteredSet(newReplies, new Filter<Reply>() {
+
+				@Override
+				public boolean filterObject(Reply reply) {
+					return currentSone.hasFriend(reply.getPost().getSone().getId()) || currentSone.equals(reply.getPost().getSone());
+				}
+
+			});
+		}
 		JsonArray jsonReplies = new JsonArray();
 		for (Reply reply : newReplies) {
 			JsonObject jsonReply = new JsonObject();
@@ -112,7 +132,7 @@ public class GetStatusAjaxPage extends JsonPage {
 			jsonReply.put("postSone", reply.getPost().getSone().getId());
 			jsonReplies.add(jsonReply);
 		}
-		return createSuccessJsonObject().put("sones", jsonSones).put("notifications", jsonNotifications).put("removedNotifications", jsonRemovedNotifications).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
+		return createSuccessJsonObject().put("sones", jsonSones).put("notifications", jsonNotifications).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**
@@ -171,7 +191,9 @@ public class GetStatusAjaxPage extends JsonPage {
 		StringWriter notificationWriter = new StringWriter();
 		try {
 			if (notification instanceof TemplateNotification) {
-				((TemplateNotification) notification).render(webInterface.getTemplateContextFactory().createTemplateContext().mergeContext(((TemplateNotification) notification).getTemplateContext()), notificationWriter);
+				TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext().mergeContext(((TemplateNotification) notification).getTemplateContext());
+				templateContext.set("notification", notification);
+				((TemplateNotification) notification).render(templateContext, notificationWriter);
 			} else {
 				notification.render(notificationWriter);
 			}