X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=fd9ae7695b0fcb55d0f55aaa41aa0c9eb3713f12;hb=33f333b35a73d3d4a4e79f41e9dd7b342db87b1a;hp=a358fb1df4fa65b9eed1b0068bdaecfb94c1611b;hpb=fa63b855e28c5fbf270bfdca1bb23fd048affae5;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 a358fb1..fd9ae76 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -17,6 +17,8 @@
 
 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;
@@ -34,6 +36,8 @@ import net.pterodactylus.sone.web.WebInterface;
 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
@@ -120,6 +124,14 @@ public class GetStatusAjaxPage extends JsonPage {
 		return false;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean requiresLogin() {
+		return false;
+	}
+
 	//
 	// PRIVATE METHODS
 	//
@@ -139,6 +151,7 @@ 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())));
 		}
@@ -153,10 +166,22 @@ public class GetStatusAjaxPage extends JsonPage {
 	 *            The notification to create a JSON object
 	 * @return The JSON object
 	 */
-	private static JsonObject createJsonNotification(Notification notification) {
+	private JsonObject createJsonNotification(Notification notification) {
 		JsonObject jsonNotification = new JsonObject();
 		jsonNotification.put("id", notification.getId());
-		jsonNotification.put("text", notification.toString());
+		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());