X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPage.java;h=00561564c9ed0f610b548ab06fb0ea66bba6d3de;hb=fd88107b013522d7620f5297386472206f320e10;hp=8c0387e78b7f57770ad056ad29bef3cd2d2e44ce;hpb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;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 8c0387e..0056156 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
@@ -19,9 +19,9 @@ package net.pterodactylus.sone.web.ajax;
 
 import com.google.common.base.Optional;
 
+import net.pterodactylus.sone.data.LocalSone;
 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;
@@ -55,17 +55,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);
-		if (sender == null) {
-			sender = getCurrentSone(request.getToadletContext()).get();
+		Optional<LocalSone> sender = webInterface.getCore().getLocalSone(senderId);
+		if (!sender.isPresent()) {
+			sender = 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());
 	}
 
 }