X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPage.java;h=337a238f8e0237f3d46c03d0c446a915b47f4943;hb=c9e306ac8e3ada846e87a0cc256a20fc148f381c;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..337a238 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
@@ -18,8 +18,11 @@
 package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 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;
 
 /**
@@ -36,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);
 	}
 
 	//
@@ -47,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 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);
+		text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+		PostReply reply = webInterface.getCore().createReply(sender, post, text);
+		return createSuccessJsonObject().put("reply", reply.getId()).put("sone", sender.getId());
 	}
 
 }