X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FMarkAsKnownPage.java;h=215ce934383b6ff2df458f99459abe18ec5190b0;hp=dd3882aba0bb652bc4e11c0a58f7cae89cf7e316;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=9e4db46b86d084eba9029906e779ec1d96f78ac4

diff --git a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
index dd3882a..215ce93 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–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
@@ -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.
@@ -42,7 +46,7 @@ public class MarkAsKnownPage extends SoneTemplatePage {
 	 *            The Sone web interface
 	 */
 	public MarkAsKnownPage(Template template, WebInterface webInterface) {
-		super("markAsKnown.html", template, "Page.MarkRead.Title", webInterface);
+		super("markAsKnown.html", template, "Page.MarkAsKnown.Title", webInterface);
 	}
 
 	//
@@ -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")) {
@@ -62,29 +66,27 @@ public class MarkAsKnownPage extends SoneTemplatePage {
 		String ids = request.getHttpRequest().getPartAsStringFailsafe("id", 65536);
 		for (StringTokenizer idTokenizer = new StringTokenizer(ids); idTokenizer.hasMoreTokens();) {
 			String id = idTokenizer.nextToken();
-			System.out.println("id: " + id);
 			if (type.equals("post")) {
-				Post post = webInterface.getCore().getPost(id, false);
-				if (post == null) {
+				Optional<Post> post = webInterface.getCore().getPost(id);
+				if (!post.isPresent()) {
 					continue;
 				}
-				webInterface.getCore().markPostKnown(post);
+				webInterface.getCore().markPostKnown(post.get());
 			} 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) {
+				Optional<Sone> sone = webInterface.getCore().getSone(id);
+				if (!sone.isPresent()) {
 					continue;
 				}
-				webInterface.getCore().markSoneKnown(sone);
+				webInterface.getCore().markSoneKnown(sone.get());
 			}
 		}
 		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
-		System.out.println("returnPage: " + returnPage);
 		throw new RedirectException(returnPage);
 	}