X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDeleteReplyAjaxPage.java;h=2aa217de92a33014395918b39dba71381b5165f5;hp=c996e5295b91de8392e6225fbcd5d48adff84bf5;hb=93fdf9e218d808f65f618abbddce183191d8c15b;hpb=f1df213e6939ca7a8c5775a2f03dd3be163764bd

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 c996e52..2aa217d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeleteReplysAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - DeleteReplyAjaxPage.java - Copyright © 2010–2013 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,9 +17,11 @@
 
 package net.pterodactylus.sone.web.ajax;
 
-import net.pterodactylus.sone.data.Reply;
-import net.pterodactylus.sone.data.Sone;
+import com.google.common.base.Optional;
+
+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;
 
 /**
@@ -36,7 +38,7 @@ public class DeleteReplyAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public DeleteReplyAjaxPage(WebInterface webInterface) {
-		super("ajax/deleteReply.ajax", webInterface);
+		super("deleteReply.ajax", webInterface);
 	}
 
 	//
@@ -47,21 +49,17 @@ public class DeleteReplyAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonObject createJsonObject(FreenetRequest request) {
 		String replyId = request.getHttpRequest().getParam("reply");
-		Reply reply = webInterface.core().getReply(replyId);
-		Sone currentSone = getCurrentSone(request.getToadletContext());
-		if (reply == null) {
-			return new JsonObject().put("success", false).put("error", "invalid-reply-id");
-		}
-		if (currentSone == null) {
-			return new JsonObject().put("success", false).put("error", "auth-required");
+		Optional<PostReply> reply = webInterface.getCore().getPostReply(replyId);
+		if (!reply.isPresent()) {
+			return createErrorJsonObject("invalid-reply-id");
 		}
-		if (!reply.getSone().equals(currentSone)) {
-			return new JsonObject().put("success", false).put("error", "not-authorized");
+		if (!reply.get().getSone().isLocal()) {
+			return createErrorJsonObject("not-authorized");
 		}
-		webInterface.core().deleteReply(reply);
-		return new JsonObject().put("success", true);
+		webInterface.getCore().deleteReply(reply.get());
+		return createSuccessJsonObject();
 	}
 
 }