X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDeletePostAjaxPage.java;h=8d3b414a7d2522ed2dfc3450256f29b13627f974;hb=85fd1173da553ee8c1afbe0c4638cc9bbce8d44f;hp=603c013547a478572e4b14b77edf9d910064ba21;hpb=341d8308a20e234dbec084be1b370367fa63ff94;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java
index 603c013..8d3b414 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java
@@ -18,7 +18,6 @@
 package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.json.JsonObject;
 
@@ -36,7 +35,7 @@ public class DeletePostAjaxPage extends JsonPage {
 	 *            The Sone web interface
 	 */
 	public DeletePostAjaxPage(WebInterface webInterface) {
-		super("ajax/deletePost.ajax", webInterface);
+		super("deletePost.ajax", webInterface);
 	}
 
 	//
@@ -49,18 +48,14 @@ public class DeletePostAjaxPage extends JsonPage {
 	@Override
 	protected JsonObject createJsonObject(Request request) {
 		String postId = request.getHttpRequest().getParam("post");
-		Post post = webInterface.getCore().getPost(postId);
-		Sone currentSone = getCurrentSone(request.getToadletContext());
-		if (post == null) {
+		Post post = webInterface.getCore().getPost(postId, false);
+		if ((post == null) || (post.getSone() == null)) {
 			return createErrorJsonObject("invalid-post-id");
 		}
-		if (currentSone == null) {
-			return createErrorJsonObject("auth-required");
-		}
-		if (!post.getSone().equals(currentSone)) {
+		if (!webInterface.getCore().isLocalSone(post.getSone())) {
 			return createErrorJsonObject("not-authorized");
 		}
-		currentSone.removePost(post);
+		webInterface.getCore().deletePost(post);
 		return createSuccessJsonObject();
 	}