X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetReplyAjaxPage.java;h=a2ee122b3cd1b9b73a348333962be8cbd921e502;hp=0963b09a6fd5d117954ff3cad9d4e3325132c271;hb=93fdf9e218d808f65f618abbddce183191d8c15b;hpb=d7df2d32e1986db76e36103167b41f0edc5d831d

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 0963b09..a2ee122 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - GetReplyAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - GetReplyAjaxPage.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,11 +19,16 @@ package net.pterodactylus.sone.web.ajax;
 
 import java.io.StringWriter;
 
-import net.pterodactylus.sone.data.Reply;
+import com.google.common.base.Optional;
+
+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;
 
 /**
@@ -57,14 +62,13 @@ public class GetReplyAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonObject createJsonObject(FreenetRequest request) {
 		String replyId = request.getHttpRequest().getParam("reply");
-		Reply reply = webInterface.getCore().getReply(replyId);
-		if ((reply == null) || (reply.getSone() == null)) {
+		Optional<PostReply> reply = webInterface.getCore().getPostReply(replyId);
+		if (!reply.isPresent()) {
 			return createErrorJsonObject("invalid-reply-id");
 		}
-		replyTemplate.set("currentSone", getCurrentSone(request.getToadletContext()));
-		return createSuccessJsonObject().put("reply", createJsonReply(reply));
+		return createSuccessJsonObject().put("reply", createJsonReply(request, reply.get(), getCurrentSone(request.getToadletContext())));
 	}
 
 	/**
@@ -82,26 +86,32 @@ public class GetReplyAjaxPage extends JsonPage {
 	/**
 	 * Creates a JSON representation of the given reply.
 	 *
+	 * @param request
+	 *            The request being processed
 	 * @param reply
 	 *            The reply to convert
+	 * @param currentSone
+	 *            The currently logged in Sone (to store in the template)
 	 * @return The JSON representation of the reply
 	 */
-	private JsonObject createJsonReply(Reply reply) {
+	private JsonObject createJsonReply(FreenetRequest request, PostReply reply, Sone currentSone) {
 		JsonObject jsonReply = new JsonObject();
 		jsonReply.put("id", reply.getId());
 		jsonReply.put("postId", reply.getPost().getId());
 		jsonReply.put("soneId", reply.getSone().getId());
 		jsonReply.put("time", reply.getTime());
 		StringWriter stringWriter = new StringWriter();
-		synchronized (replyTemplate) {
-			replyTemplate.set("reply", reply);
-			try {
-				replyTemplate.render(stringWriter);
-			} catch (TemplateException te1) {
-				/* TODO - shouldn’t happen. */
-			} finally {
-				Closer.close(stringWriter);
-			}
+		TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext();
+		templateContext.set("core", webInterface.getCore());
+		templateContext.set("request", request);
+		templateContext.set("reply", reply);
+		templateContext.set("currentSone", currentSone);
+		try {
+			replyTemplate.render(templateContext, stringWriter);
+		} catch (TemplateException te1) {
+			/* TODO - shouldn’t happen. */
+		} finally {
+			Closer.close(stringWriter);
 		}
 		return jsonReply.put("html", stringWriter.toString());
 	}