X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUnbookmarkPage.java;h=51da550395d01719fc1da621eca5da5ee418e05a;hb=3d6cffe82270a1faacf1f0d39c34b11ab316e0db;hp=def3bf417ae239fb1c0bec74c6f5a4e6339e984a;hpb=45f92ec63dbf8134d92ceed67294faa38117b195;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java b/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
index def3bf4..51da550 100644
--- a/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - UnbookmarkPage.java - Copyright © 2011 David Roden
+ * Sone - UnbookmarkPage.java - Copyright © 2011–2016 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
@@ -25,6 +25,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;
+
 /**
  * Page that lets the user unbookmark a post.
  *
@@ -55,15 +57,18 @@ public class UnbookmarkPage extends SoneTemplatePage {
 		if (request.getMethod() == Method.POST) {
 			String id = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
 			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
-			webInterface.getCore().unbookmarkPost(id);
+			Optional<Post> post = webInterface.getCore().getPost(id);
+			if (post.isPresent()) {
+				webInterface.getCore().unbookmarkPost(post.get());
+			}
 			throw new RedirectException(returnPage);
 		}
 		String id = request.getHttpRequest().getParam("post");
 		if (id.equals("allNotLoaded")) {
 			Set<Post> posts = webInterface.getCore().getBookmarkedPosts();
 			for (Post post : posts) {
-				if (post.getSone() == null) {
-					webInterface.getCore().unbookmark(post);
+				if (post.isLoaded()) {
+					webInterface.getCore().unbookmarkPost(post);
 				}
 			}
 			throw new RedirectException("bookmarks.html");