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=4727686b9f6a717870736ae94c1d6f9b1cafa5ca;hp=470111880fe233419664328ca13646b8fec59f59;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd

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 4701118..4727686 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–2013 David Roden
+ * Sone - MarkAsKnownAjaxPage.java - Copyright © 2011–2015 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
@@ -24,7 +24,6 @@ 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;
 
@@ -50,7 +49,7 @@ public class MarkAsKnownAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String type = request.getHttpRequest().getParam("type");
 		if (!type.equals("sone") && !type.equals("post") && !type.equals("reply")) {
 			return createErrorJsonObject("invalid-type");
@@ -71,11 +70,11 @@ public class MarkAsKnownAjaxPage extends JsonPage {
 				}
 				core.markReplyKnown(reply.get());
 			} else if (type.equals("sone")) {
-				Sone sone = core.getSone(id);
-				if (sone == null) {
+				Optional<Sone> sone = core.getSone(id);
+				if (!sone.isPresent()) {
 					continue;
 				}
-				core.markSoneKnown(sone);
+				core.markSoneKnown(sone.get());
 			}
 		}
 		return createSuccessJsonObject();