projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add accessors for testing.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
DeletePostAjaxPage.java
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
16c047d
..
acf5f03
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - DeletePostAjaxPage.java - Copyright © 2010 David Roden
+ * Sone - DeletePostAjaxPage.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
*
* 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,10
+17,11
@@
package net.pterodactylus.sone.web.ajax;
package net.pterodactylus.sone.web.ajax;
+import com.google.common.base.Optional;
+
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.
util.json.JsonObjec
t;
+import net.pterodactylus.
sone.web.page.FreenetReques
t;
/**
* This AJAX page deletes a post.
/**
* This AJAX page deletes a post.
@@
-36,7
+37,7
@@
public class DeletePostAjaxPage extends JsonPage {
* The Sone web interface
*/
public DeletePostAjaxPage(WebInterface webInterface) {
* The Sone web interface
*/
public DeletePostAjaxPage(WebInterface webInterface) {
- super("
ajax/
deletePost.ajax", webInterface);
+ super("deletePost.ajax", webInterface);
}
//
}
//
@@
-47,21
+48,17
@@
public class DeletePostAjaxPage extends JsonPage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected Json
Object createJsonObject(
Request request) {
+ protected Json
ReturnObject createJsonObject(Freenet
Request request) {
String postId = request.getHttpRequest().getParam("post");
String postId = request.getHttpRequest().getParam("post");
- Post post = webInterface.getCore().getPost(postId);
- Sone currentSone = getCurrentSone(request.getToadletContext());
- if (post == null) {
+ Optional<Post> post = webInterface.getCore().getPost(postId);
+ if (!post.isPresent()) {
return createErrorJsonObject("invalid-post-id");
}
return createErrorJsonObject("invalid-post-id");
}
- if (currentSone == null) {
- return createErrorJsonObject("auth-required");
- }
- if (!post.getSone().equals(currentSone)) {
+ if (!post.get().getSone().isLocal()) {
return createErrorJsonObject("not-authorized");
}
return createErrorJsonObject("not-authorized");
}
-
currentSone.removePost(post
);
- return
new JsonObject().put("success", true
);
+
webInterface.getCore().deletePost(post.get()
);
+ return
createSuccessJsonObject(
);
}
}
}
}