X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDeleteReplyAjaxPage.java;h=c7cbbc1fbf3a80e8a4c51ba7f204e2c5b1765a54;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=b1a331760c2de445e9424e7629aab25660e48aa7;hpb=3b751d0c053450961bb66d2507d6187ce56f8785;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
index b1a3317..c7cbbc1 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
@@ -20,7 +20,8 @@ package net.pterodactylus.sone.web.ajax;
 import net.pterodactylus.sone.data.PostReply;
 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;
 
 /**
  * This AJAX page deletes a reply.
@@ -43,20 +44,17 @@ public class DeleteReplyAjaxPage extends JsonPage {
 	// JSONPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String replyId = request.getHttpRequest().getParam("reply");
-		PostReply reply = webInterface.getCore().getPostReply(replyId);
-		if (reply == null) {
+		Optional<PostReply> reply = webInterface.getCore().getDatabase().getPostReply(replyId);
+		if (!reply.isPresent()) {
 			return createErrorJsonObject("invalid-reply-id");
 		}
-		if (!reply.getSone().isLocal()) {
+		if (!reply.get().getSone().isLocal()) {
 			return createErrorJsonObject("not-authorized");
 		}
-		webInterface.getCore().deleteReply(reply);
+		webInterface.getCore().deleteReply(reply.get());
 		return createSuccessJsonObject();
 	}