X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetReplyAjaxPage.java;h=f38e0f2076f757dd19b7bcf9cd6b784623ed23ba;hb=c9e306ac8e3ada846e87a0cc256a20fc148f381c;hp=82226e396a25573dee67badd78dd8cd5e9cff9f2;hpb=eb776984f2bf7c1f218dcc65fca80ef0298ed2f2;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 82226e3..f38e0f2 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java @@ -19,9 +19,10 @@ package net.pterodactylus.sone.web.ajax; import java.io.StringWriter; -import net.pterodactylus.sone.data.Reply; +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; @@ -59,9 +60,9 @@ 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); + PostReply reply = webInterface.getCore().getReply(replyId); if ((reply == null) || (reply.getSone() == null)) { return createErrorJsonObject("invalid-reply-id"); } @@ -83,13 +84,15 @@ 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(Request request, Reply reply, Sone currentSone) { + private JsonObject createJsonReply(FreenetRequest request, PostReply reply, Sone currentSone) { JsonObject jsonReply = new JsonObject(); jsonReply.put("id", reply.getId()); jsonReply.put("postId", reply.getPost().getId()); @@ -97,6 +100,7 @@ public class GetReplyAjaxPage extends JsonPage { jsonReply.put("time", reply.getTime()); StringWriter stringWriter = new StringWriter(); TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext(); + templateContext.set("core", webInterface.getCore()); templateContext.set("request", request); templateContext.set("reply", reply); templateContext.set("currentSone", currentSone);