X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetPostAjaxPage.java;h=92d5da61729a505a83994296842d67bbbbcc17f4;hb=4f7f61499282e109ced38a020c23b8b2024d18c4;hp=452fc5adaa3daf1bd414466c256526fa23ab3dbf;hpb=2e3b2fb869041cd573ea2acd0623d2f499d4ab1b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
index 452fc5a..92d5da6 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
@@ -20,9 +20,11 @@ package net.pterodactylus.sone.web.ajax;
 import java.io.StringWriter;
 
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.json.JsonObject;
+import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateException;
 
@@ -46,7 +48,7 @@ public class GetPostAjaxPage extends JsonPage {
 	 *            The template to render for posts
 	 */
 	public GetPostAjaxPage(WebInterface webInterface, Template postTemplate) {
-		super("ajax/getPost.ajax", webInterface);
+		super("getPost.ajax", webInterface);
 		this.postTemplate = postTemplate;
 	}
 
@@ -60,8 +62,7 @@ public class GetPostAjaxPage extends JsonPage {
 		if (post == null) {
 			return createErrorJsonObject("invalid-post-id");
 		}
-		postTemplate.set("currentSone", getCurrentSone(request.getToadletContext()));
-		return createSuccessJsonObject().put("post", createJsonPost(post));
+		return createSuccessJsonObject().put("post", createJsonPost(post, getCurrentSone(request.getToadletContext())));
 	}
 
 	/**
@@ -82,17 +83,22 @@ public class GetPostAjaxPage extends JsonPage {
 	 *
 	 * @param post
 	 *            The post to create a JSON object from
+	 * @param currentSone
+	 *            The currently logged in Sone (to store in the template)
 	 * @return The JSON representation of the post
 	 */
-	private JsonObject createJsonPost(Post post) {
+	private JsonObject createJsonPost(Post post, Sone currentSone) {
 		JsonObject jsonPost = new JsonObject();
 		jsonPost.put("id", post.getId());
 		jsonPost.put("sone", post.getSone().getId());
+		jsonPost.put("recipient", (post.getRecipient() == null) ? null : post.getRecipient().getId());
 		jsonPost.put("time", post.getTime());
-		postTemplate.set("post", post);
 		StringWriter stringWriter = new StringWriter();
+		DataProvider dataProvider = postTemplate.createDataProvider();
+		dataProvider.setData("post", post);
+		dataProvider.setData("currentSone", currentSone);
 		try {
-			postTemplate.render(stringWriter);
+			postTemplate.render(dataProvider, stringWriter);
 		} catch (TemplateException te1) {
 			/* TODO - shouldn’t happen. */
 		} finally {