X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreatePostAjaxPage.java;h=50bf2212229069025b621dfea7552c2423c90eb9;hb=858555f647a1c39b2a6707192bdb8f32107aa5dd;hp=47507948f818c6dfd7371f0629f14a7d6647156a;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;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 4750794..50bf221 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java
@@ -17,12 +17,14 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import net.pterodactylus.sone.data.LocalSone;
 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.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonObject;
+
+import com.google.common.base.Optional;
 
 /**
  * AJAX handler that creates a new post.
@@ -45,25 +47,22 @@ public class CreatePostAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
-		Sone sone = getCurrentSone(request.getToadletContext());
-		if (sone == null) {
-			return createErrorJsonObject("auth-required");
-		}
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
+		LocalSone sone = getCurrentSone(request.getToadletContext()).get();
 		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, false);
-		if (sender == null) {
-			sender = sone;
+		Optional<LocalSone> sender = webInterface.getCore().getLocalSone(senderId);
+		if (!sender.isPresent()) {
+			sender = Optional.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.getRecipient() != null) ? newPost.getRecipient().getId() : null);
+		Post newPost = webInterface.getCore().createPost(sender.get(), recipient, text);
+		return createSuccessJsonObject().put("postId", newPost.getId()).put("sone", sender.get().getId()).put("recipient", newPost.getRecipientId().orNull());
 	}
 
 }