X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPage.java;h=9ed960f529c84f3ad50f4fd4fcc4b5921673c89a;hb=85fd1173da553ee8c1afbe0c4638cc9bbce8d44f;hp=1d6dd861ff256c9f42c07a57af90a6cca2824992;hpb=ee1fdebf3f0d213c8ba451bd3a9649259d6637a5;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 1d6dd86..9ed960f 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java @@ -18,6 +18,7 @@ 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.web.WebInterface; import net.pterodactylus.util.json.JsonObject; @@ -36,7 +37,7 @@ public class CreateReplyAjaxPage extends JsonPage { * The Sone web interface */ public CreateReplyAjaxPage(WebInterface webInterface) { - super("ajax/createReply.ajax", webInterface); + super("createReply.ajax", webInterface); } // @@ -50,16 +51,17 @@ public class CreateReplyAjaxPage extends JsonPage { protected JsonObject createJsonObject(Request request) { String postId = request.getHttpRequest().getParam("post"); String text = request.getHttpRequest().getParam("text").trim(); - Sone currentSone = getCurrentSone(request.getToadletContext()); - if (currentSone == null) { - return new JsonObject().put("success", false).put("error", "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 new JsonObject().put("success", false).put("error", "invalid-post-id"); + return createErrorJsonObject("invalid-post-id"); } - webInterface.getCore().createReply(currentSone, post, text); - return new JsonObject().put("success", true); + Reply reply = webInterface.getCore().createReply(sender, post, text); + return createSuccessJsonObject().put("reply", reply.getId()).put("sone", sender.getId()); } }