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=69d831dab01c78d6dfde11032086f1bae741436c;hpb=34a27eaf3ada56df55934d7f83864f9cd2b17797;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 69d831d..9531a6d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -17,8 +17,6 @@
 
 package net.pterodactylus.sone.web.ajax;
 
-import java.io.IOException;
-import java.io.StringWriter;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -39,8 +37,6 @@ 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
@@ -86,9 +82,9 @@ public class GetStatusAjaxPage extends JsonPage {
 		/* load notifications. */
 		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));
+			jsonNotificationInformations.add(createJsonNotificationInformation(notification));
 		}
 		/* load new posts. */
 		Set<Post> newPosts = webInterface.getNewPosts();
@@ -97,7 +93,7 @@ public class GetStatusAjaxPage extends JsonPage {
 
 				@Override
 				public boolean filterObject(Post post) {
-					return currentSone.hasFriend(post.getSone().getId()) || currentSone.equals(post.getSone());
+					return currentSone.hasFriend(post.getSone().getId()) || currentSone.equals(post.getSone()) || currentSone.equals(post.getRecipient());
 				}
 
 			});
@@ -118,7 +114,7 @@ public class GetStatusAjaxPage extends JsonPage {
 
 				@Override
 				public boolean filterObject(Reply reply) {
-					return currentSone.hasFriend(reply.getPost().getSone().getId()) || currentSone.equals(reply.getPost().getSone());
+					return (reply.getPost() != null) && (reply.getPost().getSone() != null) && (currentSone.hasFriend(reply.getPost().getSone().getId()) || currentSone.equals(reply.getPost().getSone()) || currentSone.equals(reply.getPost().getRecipient()));
 				}
 
 			});
@@ -132,7 +128,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("newPosts", jsonPosts).put("newReplies", jsonReplies);
+		return createSuccessJsonObject().put("sones", jsonSones).put("notifications", jsonNotificationInformations).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
 	}
 
 	/**
@@ -174,36 +170,25 @@ public class GetStatusAjaxPage extends JsonPage {
 		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 JsonObject createJsonNotification(Notification notification) {
+	private JsonObject createJsonNotificationInformation(Notification notification) {
 		JsonObject jsonNotification = new JsonObject();
 		jsonNotification.put("id", notification.getId());
-		StringWriter notificationWriter = new StringWriter();
-		try {
-			if (notification instanceof TemplateNotification) {
-				TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext().mergeContext(((TemplateNotification) notification).getTemplateContext());
-				templateContext.set("notification", notification);
-				((TemplateNotification) notification).render(templateContext, notificationWriter);
-			} else {
-				notification.render(notificationWriter);
-			}
-		} catch (IOException ioe1) {
-			/* StringWriter never throws, ignore. */
-		}
-		jsonNotification.put("text", notificationWriter.toString());
-		jsonNotification.put("createdTime", notification.getCreatedTime());
 		jsonNotification.put("lastUpdatedTime", notification.getLastUpdatedTime());
-		jsonNotification.put("dismissable", notification.isDismissable());
 		return jsonNotification;
 	}