X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetReplyAjaxPage.java;h=14d96eeb6fb91a11480523ed7f7684d061570e58;hb=fd88107b013522d7620f5297386472206f320e10;hp=b617608377429b16b95afc2a1e2a7ecf40df4030;hpb=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
index b617608..14d96ee 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
@@ -18,19 +18,22 @@
 package net.pterodactylus.sone.web.ajax;
 
 import java.io.StringWriter;
+import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
 
 import com.google.common.base.Optional;
 
+import net.pterodactylus.sone.data.LocalSone;
 import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.template.TemplateException;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * This AJAX page returns the details of a reply.
  *
@@ -62,7 +65,7 @@ public class GetReplyAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String replyId = request.getHttpRequest().getParam("reply");
 		Optional<PostReply> reply = webInterface.getCore().getPostReply(replyId);
 		if (!reply.isPresent()) {
@@ -94,8 +97,8 @@ public class GetReplyAjaxPage extends JsonPage {
 	 *            The currently logged in Sone (to store in the template)
 	 * @return The JSON representation of the reply
 	 */
-	private JsonObject createJsonReply(FreenetRequest request, PostReply reply, Sone currentSone) {
-		JsonObject jsonReply = new JsonObject();
+	private JsonNode createJsonReply(FreenetRequest request, PostReply reply, Optional<LocalSone> currentSone) {
+		ObjectNode jsonReply = new ObjectNode(instance);
 		jsonReply.put("id", reply.getId());
 		jsonReply.put("postId", reply.getPostId());
 		jsonReply.put("soneId", reply.getSone().getId());
@@ -105,7 +108,7 @@ public class GetReplyAjaxPage extends JsonPage {
 		templateContext.set("core", webInterface.getCore());
 		templateContext.set("request", request);
 		templateContext.set("reply", reply);
-		templateContext.set("currentSone", currentSone);
+		templateContext.set("currentSone", currentSone.orNull());
 		try {
 			replyTemplate.render(templateContext, stringWriter);
 		} catch (TemplateException te1) {