X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreatePostAjaxPage.java;h=bf823289b76fa131c7fb07d6a3fbf523cffd6732;hp=ce2462cd746e9c28db0a10da286d4139eb2fd68e;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=a57e3b33c5837a40aa08c11fb92f600d928be1ab

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
index ce2462c..bf82328 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - CreatePostAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - CreatePostAjaxPage.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
@@ -19,8 +19,11 @@ package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.data.Post;
 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;
+
+import com.google.common.base.Optional;
 
 /**
  * AJAX handler that creates a new post.
@@ -36,26 +39,32 @@ public class CreatePostAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public CreatePostAjaxPage(WebInterface webInterface) {
-		super("ajax/createPost.ajax", webInterface);
+		super("createPost.ajax", webInterface);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		Sone sone = getCurrentSone(request.getToadletContext());
 		if (sone == null) {
 			return createErrorJsonObject("auth-required");
 		}
 		String recipientId = request.getHttpRequest().getParam("recipient");
-		Sone recipient = webInterface.getCore().getSone(recipientId, false);
+		Optional<Sone> recipient = webInterface.getCore().getSone(recipientId);
+		String senderId = request.getHttpRequest().getParam("sender");
+		Sone sender = webInterface.getCore().getLocalSone(senderId);
+		if (sender == null) {
+			sender = sone;
+		}
 		String text = request.getHttpRequest().getParam("text");
 		if ((text == null) || (text.trim().length() == 0)) {
 			return createErrorJsonObject("text-required");
 		}
-		Post newPost = webInterface.getCore().createPost(sone, recipient, text);
-		return createSuccessJsonObject().put("postId", newPost.getId());
+		text = TextFilter.filter(request.getHttpRequest().getHeader("host"), text);
+		Post newPost = webInterface.getCore().createPost(sender, recipient, text);
+		return createSuccessJsonObject().put("postId", newPost.getId()).put("sone", sender.getId()).put("recipient", newPost.getRecipientId().orNull());
 	}
 
 }