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

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 92d5da6..3d4633c 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - GetPostAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - GetPostAjaxPage.java - Copyright © 2010–2012 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
@@ -22,10 +22,11 @@ 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.sone.web.page.FreenetRequest;
 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.TemplateContext;
 import net.pterodactylus.util.template.TemplateException;
 
 /**
@@ -56,13 +57,13 @@ public class GetPostAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonObject createJsonObject(FreenetRequest request) {
 		String postId = request.getHttpRequest().getParam("post");
 		Post post = webInterface.getCore().getPost(postId, false);
 		if (post == null) {
 			return createErrorJsonObject("invalid-post-id");
 		}
-		return createSuccessJsonObject().put("post", createJsonPost(post, getCurrentSone(request.getToadletContext())));
+		return createSuccessJsonObject().put("post", createJsonPost(request, post, getCurrentSone(request.getToadletContext())));
 	}
 
 	/**
@@ -81,24 +82,29 @@ public class GetPostAjaxPage extends JsonPage {
 	 * Creates a JSON object from the given post. The JSON object will only
 	 * contain the ID of the post, its time, and its rendered HTML code.
 	 *
+	 * @param request
+	 *            The request being processed
 	 * @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, Sone currentSone) {
+	private JsonObject createJsonPost(FreenetRequest request, 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());
 		StringWriter stringWriter = new StringWriter();
-		DataProvider dataProvider = postTemplate.createDataProvider();
-		dataProvider.setData("post", post);
-		dataProvider.setData("currentSone", currentSone);
+		TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext();
+		templateContext.set("core", webInterface.getCore());
+		templateContext.set("request", request);
+		templateContext.set("post", post);
+		templateContext.set("currentSone", currentSone);
+		templateContext.set("localSones", webInterface.getCore().getLocalSones());
 		try {
-			postTemplate.render(dataProvider, stringWriter);
+			postTemplate.render(templateContext, stringWriter);
 		} catch (TemplateException te1) {
 			/* TODO - shouldn’t happen. */
 		} finally {