Merge branch 'release/0.9-rc1'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / BookmarkAjaxPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java
index 0cf7b01..42719d3 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - BookmarkAjaxPage.java - Copyright © 2011 David Roden
+ * Sone - BookmarkAjaxPage.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
@@ -17,9 +17,11 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonObject;
+
+import com.google.common.base.Optional;
 
 /**
  * AJAX page that lets the user bookmark a post.
@@ -46,12 +48,15 @@ public class BookmarkAjaxPage extends JsonPage {
         * {@inheritDoc}
         */
        @Override
-       protected JsonObject createJsonObject(FreenetRequest request) {
+       protected JsonReturnObject createJsonObject(FreenetRequest request) {
                String id = request.getHttpRequest().getParam("post", null);
                if ((id == null) || (id.length() == 0)) {
                        return createErrorJsonObject("invalid-post-id");
                }
-               webInterface.getCore().bookmarkPost(id);
+               Optional<Post> post = webInterface.getCore().getPost(id);
+               if (post.isPresent()) {
+                       webInterface.getCore().bookmarkPost(post.get());
+               }
                return createSuccessJsonObject();
        }