X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPage.java;h=9f5c88299d1a63f24079c031fae0cafec85d9414;hb=45f92ec63dbf8134d92ceed67294faa38117b195;hp=486fb75f0c6e34eb75e16c49ffe406ccba261d4d;hpb=341d8308a20e234dbec084be1b370367fa63ff94;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java index 486fb75..9f5c882 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java @@ -20,7 +20,9 @@ package net.pterodactylus.sone.web.ajax; import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Reply; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.text.TextFilter; import net.pterodactylus.sone.web.WebInterface; +import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.json.JsonObject; /** @@ -37,7 +39,7 @@ public class CreateReplyAjaxPage extends JsonPage { * The Sone web interface */ public CreateReplyAjaxPage(WebInterface webInterface) { - super("ajax/createReply.ajax", webInterface); + super("createReply.ajax", webInterface); } // @@ -48,19 +50,21 @@ public class CreateReplyAjaxPage extends JsonPage { * {@inheritDoc} */ @Override - protected JsonObject createJsonObject(Request request) { + protected JsonObject createJsonObject(FreenetRequest request) { String postId = request.getHttpRequest().getParam("post"); String text = request.getHttpRequest().getParam("text").trim(); - Sone currentSone = getCurrentSone(request.getToadletContext()); - if (currentSone == null) { - return createErrorJsonObject("auth-required"); + String senderId = request.getHttpRequest().getParam("sender"); + Sone sender = webInterface.getCore().getLocalSone(senderId, false); + if (sender == null) { + sender = getCurrentSone(request.getToadletContext()); } Post post = webInterface.getCore().getPost(postId); if ((post == null) || (post.getSone() == null)) { return createErrorJsonObject("invalid-post-id"); } - Reply reply = webInterface.getCore().createReply(currentSone, post, text); - return createSuccessJsonObject().put("reply", reply.getId()); + text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text); + Reply reply = webInterface.getCore().createReply(sender, post, text); + return createSuccessJsonObject().put("reply", reply.getId()).put("sone", sender.getId()); } }