X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUnbookmarkPage.java;h=72ff2fccbc473315f5e810db2b157a141143be3a;hp=60165b2d41fa7bb7cf66ee9518b3d8775cd12b1a;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hpb=aa94dcb712392b69cb431d1637e4948688d15791

diff --git a/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java b/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
index 60165b2..72ff2fc 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–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
@@ -20,9 +20,12 @@ package net.pterodactylus.sone.web;
 import java.util.Set;
 
 import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 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.
@@ -49,20 +52,23 @@ public class UnbookmarkPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		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");