X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPage.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPage.java;h=ab5bca34931ab81d2f1e3c112038642c053f787e;hp=ea2a2c23ce6932b2ed1409f6a17264f928625f48;hb=2f995a29d8731dc3b3d20e78fd9382be542292ff;hpb=19632b7bb999f888668bdb6d8bdfe0572002b8e4

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 ea2a2c2..ab5bca3 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.sone.web.ajax;
 
-import com.google.common.base.Optional;
+import static com.google.common.base.Optional.of;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
@@ -26,6 +26,8 @@ import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 
+import com.google.common.base.Optional;
+
 /**
  * This AJAX page create a reply.
  *
@@ -55,17 +57,17 @@ public class CreateReplyAjaxPage extends JsonPage {
 		String postId = request.getHttpRequest().getParam("post");
 		String text = request.getHttpRequest().getParam("text").trim();
 		String senderId = request.getHttpRequest().getParam("sender");
-		Sone sender = webInterface.getCore().getLocalSone(senderId, false);
-		if (sender == null) {
-			sender = getCurrentSone(request.getToadletContext());
+		Optional<Sone> sender = webInterface.getCore().getLocalSone(senderId);
+		if (!sender.isPresent()) {
+			sender = of(getCurrentSone(request.getToadletContext()));
 		}
 		Optional<Post> post = webInterface.getCore().getPost(postId);
 		if (!post.isPresent()) {
 			return createErrorJsonObject("invalid-post-id");
 		}
 		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());
+		PostReply reply = webInterface.getCore().createReply(sender.get(), post.get(), text);
+		return createSuccessJsonObject().put("reply", reply.getId()).put("sone", sender.get().getId());
 	}
 
 }