X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=9531a6d51decee030650406be98dcf4c2e64f399;hb=f17403575ea2b0766a307ff322eca7ea4f84ce90;hp=8b1612b072925077200e19c586fe844ed3315aab;hpb=2a69c05787c49cdb8bf88a1d7e89226237f11d70;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 8b1612b..9531a6d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -22,14 +22,18 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 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;
@@ -52,7 +56,7 @@ public class GetStatusAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public GetStatusAjaxPage(WebInterface webInterface) {
-		super("ajax/getStatus.ajax", webInterface);
+		super("getStatus.ajax", webInterface);
 	}
 
 	/**
@@ -60,39 +64,71 @@ 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 = loadAllSones ? webInterface.getCore().getSones() : Collections.singleton(getCurrentSone(request.getToadletContext()));
+		Set<Sone> sones = new HashSet<Sone>(Collections.singleton(getCurrentSone(request.getToadletContext(), false)));
+		if (loadAllSones) {
+			sones.addAll(webInterface.getCore().getSones());
+		}
 		JsonArray jsonSones = new JsonArray();
 		for (Sone sone : sones) {
+			if (sone == null) {
+				continue;
+			}
 			JsonObject jsonSone = createJsonSone(sone);
 			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();
+		JsonArray jsonNotificationInformations = new JsonArray();
 		for (Notification notification : notifications) {
-			jsonNotifications.add(createJsonNotification(notification));
-		}
-		JsonArray jsonRemovedNotifications = new JsonArray();
-		for (Notification notification : removedNotifications) {
-			jsonRemovedNotifications.add(createJsonNotification(notification));
+			jsonNotificationInformations.add(createJsonNotificationInformation(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()) || currentSone.equals(post.getRecipient());
+				}
+
+			});
+		}
 		JsonArray jsonPosts = new JsonArray();
 		for (Post post : newPosts) {
-			jsonPosts.add(post.getId());
+			JsonObject jsonPost = new JsonObject();
+			jsonPost.put("id", post.getId());
+			jsonPost.put("sone", post.getSone().getId());
+			jsonPost.put("recipient", (post.getRecipient() != null) ? post.getRecipient().getId() : null);
+			jsonPost.put("time", post.getTime());
+			jsonPosts.add(jsonPost);
 		}
 		/* 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 (reply.getPost() != null) && (reply.getPost().getSone() != null) && (currentSone.hasFriend(reply.getPost().getSone().getId()) || currentSone.equals(reply.getPost().getSone()) || currentSone.equals(reply.getPost().getRecipient()));
+				}
+
+			});
+		}
 		JsonArray jsonReplies = new JsonArray();
 		for (Reply reply : newReplies) {
-			jsonReplies.add(reply.getId());
+			JsonObject jsonReply = new JsonObject();
+			jsonReply.put("id", reply.getId());
+			jsonReply.put("sone", reply.getSone().getId());
+			jsonReply.put("post", reply.getPost().getId());
+			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", jsonNotificationInformations).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**
@@ -103,6 +139,14 @@ public class GetStatusAjaxPage extends JsonPage {
 		return false;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean requiresLogin() {
+		return false;
+	}
+
 	//
 	// PRIVATE METHODS
 	//
@@ -122,27 +166,29 @@ public class GetStatusAjaxPage extends JsonPage {
 		jsonSone.put("status", webInterface.getCore().getSoneStatus(sone).name());
 		jsonSone.put("modified", webInterface.getCore().isModifiedSone(sone));
 		jsonSone.put("locked", webInterface.getCore().isLocked(sone));
+		jsonSone.put("lastUpdatedUnknown", sone.getTime() == 0);
 		synchronized (dateFormat) {
 			jsonSone.put("lastUpdated", dateFormat.format(new Date(sone.getTime())));
 		}
-		jsonSone.put("age", (System.currentTimeMillis() - sone.getTime()) / 1000);
+		jsonSone.put("lastUpdatedText", GetTimesAjaxPage.getTime(webInterface, System.currentTimeMillis() - sone.getTime()).getText());
 		return jsonSone;
 	}
 
 	/**
-	 * Creates a JSON object from the given notification.
+	 * 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 to create a JSON object
-	 * @return The JSON object
+	 *            The notification
+	 * @return A JSON object containing the notification ID and last-updated
+	 *         time
 	 */
-	private static JsonObject createJsonNotification(Notification notification) {
+	private JsonObject createJsonNotificationInformation(Notification notification) {
 		JsonObject jsonNotification = new JsonObject();
 		jsonNotification.put("id", notification.getId());
-		jsonNotification.put("text", notification.toString());
-		jsonNotification.put("createdTime", notification.getCreatedTime());
 		jsonNotification.put("lastUpdatedTime", notification.getLastUpdatedTime());
-		jsonNotification.put("dismissable", notification.isDismissable());
 		return jsonNotification;
 	}