X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreatePostAjaxPage.java;h=3902951f4e61673ad683c0b88a1b06a043d6574d;hb=2835d19c0c20dc13fab9371f8cd56984c9114dab;hp=423d2df86c4f84514afb4a787432f312af42c704;hpb=c842faebb65eb5210de8f6a2d0be85307d0c163f;p=Sone.git

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 423d2df..3902951 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import static com.google.common.base.Optional.of;
+import static net.pterodactylus.sone.data.Identified.GET_ID;
+
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.text.TextFilter;
@@ -42,9 +45,6 @@ public class CreatePostAjaxPage extends JsonPage {
 		super("createPost.ajax", webInterface);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		Sone sone = getCurrentSone(request.getToadletContext());
@@ -54,17 +54,17 @@ public class CreatePostAjaxPage extends JsonPage {
 		String recipientId = request.getHttpRequest().getParam("recipient");
 		Optional<Sone> recipient = webInterface.getCore().getSone(recipientId);
 		String senderId = request.getHttpRequest().getParam("sender");
-		Sone sender = webInterface.getCore().getLocalSone(senderId, false);
-		if (sender == null) {
-			sender = sone;
+		Optional<Sone> sender = webInterface.getCore().getLocalSone(senderId);
+		if (!sender.isPresent()) {
+			sender = of(sone);
 		}
 		String text = request.getHttpRequest().getParam("text");
 		if ((text == null) || (text.trim().length() == 0)) {
 			return createErrorJsonObject("text-required");
 		}
 		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());
+		Post newPost = sender.get().newPostBuilder().to(recipient.transform(GET_ID)).withText(text).build(webInterface.getCore().postCreated());
+		return createSuccessJsonObject().put("postId", newPost.getId()).put("sone", sender.get().getId()).put("recipient", newPost.getRecipientId().orNull());
 	}
 
 }