X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FMarkAsKnownAjaxPage.java;h=fec58004d83b3a75f120acaffa192b64d0fa5a0a;hp=b641ea08856a5c8cfe365c55d4d85e0ba7dc664c;hb=93fdf9e218d808f65f618abbddce183191d8c15b;hpb=ecf753a31601e558b681daab0598009fe9eec99a

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.java
index b641ea0..fec5800 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - MarkAsKnownAjaxPage.java - Copyright © 2011 David Roden
+ * Sone - MarkAsKnownAjaxPage.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,11 +19,15 @@ package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 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 mark a number of {@link Sone}s, {@link Post}s,
  * or {@link Reply}s as known.
@@ -46,7 +50,7 @@ public class MarkAsKnownAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(Request request) {
+	protected JsonObject createJsonObject(FreenetRequest request) {
 		String type = request.getHttpRequest().getParam("type");
 		if (!type.equals("sone") && !type.equals("post") && !type.equals("reply")) {
 			return createErrorJsonObject("invalid-type");
@@ -55,17 +59,17 @@ public class MarkAsKnownAjaxPage extends JsonPage {
 		Core core = webInterface.getCore();
 		for (String id : ids) {
 			if (type.equals("post")) {
-				Post post = core.getPost(id, false);
+				Post post = core.getPost(id);
 				if (post == null) {
 					continue;
 				}
 				core.markPostKnown(post);
 			} else if (type.equals("reply")) {
-				Reply reply = core.getReply(id, false);
-				if (reply == null) {
+				Optional<PostReply> reply = core.getPostReply(id);
+				if (!reply.isPresent()) {
 					continue;
 				}
-				core.markReplyKnown(reply);
+				core.markReplyKnown(reply.get());
 			} else if (type.equals("sone")) {
 				Sone sone = core.getSone(id, false);
 				if (sone == null) {