X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreateReplyAjaxPage.java;h=fe2ae858cd5c30d1441c93d2ca99c4ec8272afbb;hp=337a238f8e0237f3d46c03d0c446a915b47f4943;hb=cf4ccc7587da36e4a6ba6aa7c04394280b35e271;hpb=54e35873a9660bc51aae7cdb4c1e7d399e50986b

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 337a238..fe2ae85 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - CreateReplyAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - CreateReplyAjaxPage.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
@@ -17,13 +17,14 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import com.google.common.base.Optional;
+
 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;
-import net.pterodactylus.util.json.JsonObject;
 
 /**
  * This AJAX page create a reply.
@@ -50,20 +51,20 @@ public class CreateReplyAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		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);
+		Sone sender = webInterface.getCore().getLocalSone(senderId);
 		if (sender == null) {
 			sender = getCurrentSone(request.getToadletContext());
 		}
-		Post post = webInterface.getCore().getPost(postId);
-		if ((post == null) || (post.getSone() == null)) {
+		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, text);
+		PostReply reply = webInterface.getCore().createReply(sender, post.get(), text);
 		return createSuccessJsonObject().put("reply", reply.getId()).put("sone", sender.getId());
 	}