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

diff --git a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
index 04ad304..dc1841b 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 - MarkAsKnownPage.java - Copyright © 2011–2013 David Roden
+ * Sone - MarkAsKnownPage.java - Copyright © 2011–2016 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
@@ -57,8 +57,7 @@ public class MarkAsKnownPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		String type = request.getHttpRequest().getPartAsStringFailsafe("type", 5);
 		if (!type.equals("sone") && !type.equals("post") && !type.equals("reply")) {
 			throw new RedirectException("invalid.html");
@@ -67,11 +66,11 @@ 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);
-				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")) {
 				Optional<PostReply> reply = webInterface.getCore().getPostReply(id);
 				if (!reply.isPresent()) {
@@ -79,11 +78,11 @@ public class MarkAsKnownPage extends SoneTemplatePage {
 				}
 				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);