Verify post better.
[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / DeletePostAjaxPage.java
index 4389e57..d2a7a39 100644 (file)
@@ -49,19 +49,19 @@ public class DeletePostAjaxPage extends JsonPage {
        @Override
        protected JsonObject createJsonObject(Request request) {
                String postId = request.getHttpRequest().getParam("post");
-               Post post = webInterface.getCore().getPost(postId);
+               Post post = webInterface.getCore().getPost(postId, false);
                Sone currentSone = getCurrentSone(request.getToadletContext());
-               if (post == null) {
-                       return new JsonObject().put("success", false).put("error", "invalid-post-id");
+               if ((post == null) || (post.getSone() == null)) {
+                       return createErrorJsonObject("invalid-post-id");
                }
                if (currentSone == null) {
-                       return new JsonObject().put("success", false).put("error", "auth-required");
+                       return createErrorJsonObject("auth-required");
                }
                if (!post.getSone().equals(currentSone)) {
-                       return new JsonObject().put("success", false).put("error", "not-authorized");
+                       return createErrorJsonObject("not-authorized");
                }
-               currentSone.removePost(post);
-               return new JsonObject().put("success", true);
+               webInterface.getCore().deletePost(post);
+               return createSuccessJsonObject();
        }
 
 }