X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeletePostPage.java;h=5cb4b449a520c8af46ddb1269280cc170d1c0d50;hb=c4eb31ab64627adfdeed2a445d67883371203e99;hp=1363ac9cd740528a43b7840cc1350eb29f611caf;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java b/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
index 1363ac9..5cb4b44 100644
--- a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
@@ -23,6 +23,8 @@ import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
 
+import com.google.common.base.Optional;
+
 /**
  * Lets the user delete a post they made.
  *
@@ -46,28 +48,28 @@ public class DeletePostPage extends SoneTemplatePage {
 	// TEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		if (request.getMethod() == Method.GET) {
 			String postId = request.getHttpRequest().getParam("post");
 			String returnPage = request.getHttpRequest().getParam("returnPage");
-			Post post = webInterface.getCore().getPost(postId);
-			templateContext.set("post", post);
+			Optional<Post> post = webInterface.getCore().getDatabase().getPost(postId);
+			if (!post.isPresent()) {
+				throw new RedirectException("noPermission.html");
+			}
+			templateContext.set("post", post.get());
 			templateContext.set("returnPage", returnPage);
 			return;
 		} else if (request.getMethod() == Method.POST) {
 			String postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
 			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
-			Post post = webInterface.getCore().getPost(postId);
-			if (!post.getSone().isLocal()) {
+			Optional<Post> post = webInterface.getCore().getDatabase().getPost(postId);
+			if (!post.isPresent() || !post.get().getSone().isLocal()) {
 				throw new RedirectException("noPermission.html");
 			}
 			if (request.getHttpRequest().isPartSet("confirmDelete")) {
-				webInterface.getCore().deletePost(post);
+				webInterface.getCore().deletePost(post.get());
 				throw new RedirectException(returnPage);
 			} else if (request.getHttpRequest().isPartSet("abortDelete")) {
 				throw new RedirectException(returnPage);