X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPage.java;h=fe2ae858cd5c30d1441c93d2ca99c4ec8272afbb;hp=c297bb398e5c83679fb83e91b0fb7ed183205a0c;hb=cf4ccc7587da36e4a6ba6aa7c04394280b35e271;hpb=6fdee5deb36fd25bf706b445f2315ea00480cddf

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 c297bb3..fe2ae85 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - CreateReplyAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - CreateReplyAjaxPage.java - Copyright © 2010–2016 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
@@ -17,11 +17,14 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import com.google.common.base.Optional;
+
 import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+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.util.json.JsonObject;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 
 /**
  * This AJAX page create a reply.
@@ -37,7 +40,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 +51,21 @@ public class CreateReplyAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonReturnObject 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);
+		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");
+		Optional<Post> post = webInterface.getCore().getPost(postId);
+		if (!post.isPresent()) {
+			return createErrorJsonObject("invalid-post-id");
 		}
-		Reply reply = webInterface.getCore().createReply(currentSone, post, text);
-		return new JsonObject().put("success", true).put("reply", reply.getId());
+		text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+		PostReply reply = webInterface.getCore().createReply(sender, post.get(), text);
+		return createSuccessJsonObject().put("reply", reply.getId()).put("sone", sender.getId());
 	}
 
 }