X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUnbookmarkPage.java;h=aa5ef2ae39fa7dd37df6d49b6b279973da90b0fe;hb=00d6cb2688d8dda20ce55d71825b4446701a3a7a;hp=5e8a2a87d362cb22b7f8ca6b1febed2be05fb2c2;hpb=a47643aed43d118ca68044f95451bb5374cdb332;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 5e8a2a8..aa5ef2a 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–2012 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
@@ -19,12 +19,15 @@ package net.pterodactylus.sone.web;
 
 import java.util.Set;
 
+import net.pterodactylus.sone.data.IdBuilder;
 import net.pterodactylus.sone.data.Post;
 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.
  *
@@ -50,20 +53,22 @@ public class UnbookmarkPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	protected void processSonePage(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		if (request.getMethod() == Method.POST) {
-			String id = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
+			String id = request.getHttpRequest().getPartAsStringFailsafe("post", IdBuilder.ID_STRING_LENGTH);
 			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");