X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FMarkAsKnownPage.java;h=04ad3043474eeefbcb34f29348071d53f716e5e7;hp=4ecf6e0d1c0e8ceedf742f40eb998b61292abd89;hb=93fdf9e218d808f65f618abbddce183191d8c15b;hpb=b40109ddc7f9da46eb68fc1d9e6d7b5a8bce2890

diff --git a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
index 4ecf6e0..04ad304 100644
--- a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - MarkReadPage.java - Copyright © 2011 David Roden
+ * Sone - MarkAsKnownPage.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,11 +20,15 @@ package net.pterodactylus.sone.web;
 import java.util.StringTokenizer;
 
 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.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.base.Optional;
+
 /**
  * Page that lets the user mark a number of {@link Sone}s, {@link Post}s, or
  * {@link Reply Replie}s as known.
@@ -53,7 +57,7 @@ public class MarkAsKnownPage 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);
 		String type = request.getHttpRequest().getPartAsStringFailsafe("type", 5);
 		if (!type.equals("sone") && !type.equals("post") && !type.equals("reply")) {
@@ -63,17 +67,17 @@ public class MarkAsKnownPage extends SoneTemplatePage {
 		for (StringTokenizer idTokenizer = new StringTokenizer(ids); idTokenizer.hasMoreTokens();) {
 			String id = idTokenizer.nextToken();
 			if (type.equals("post")) {
-				Post post = webInterface.getCore().getPost(id, false);
+				Post post = webInterface.getCore().getPost(id);
 				if (post == null) {
 					continue;
 				}
 				webInterface.getCore().markPostKnown(post);
 			} else if (type.equals("reply")) {
-				Reply reply = webInterface.getCore().getReply(id, false);
-				if (reply == null) {
+				Optional<PostReply> reply = webInterface.getCore().getPostReply(id);
+				if (!reply.isPresent()) {
 					continue;
 				}
-				webInterface.getCore().markReplyKnown(reply);
+				webInterface.getCore().markReplyKnown(reply.get());
 			} else if (type.equals("sone")) {
 				Sone sone = webInterface.getCore().getSone(id, false);
 				if (sone == null) {