X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FMarkAsKnownPage.java;h=57ea00ff2b0b48e1b431a9beecb56aaf3efa643e;hp=f183ff40b428d40d022a5f48c1af0de0b3178b0e;hb=9acbc5bdec4ccb752e0856a501568b0bb6161579;hpb=6d8f11098552fcb40a87d3e35690b3ba760fb947 diff --git a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java index f183ff4..57ea00f 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"); @@ -78,12 +77,12 @@ public class MarkAsKnownPage extends SoneTemplatePage { continue; } webInterface.getCore().markReplyKnown(reply.get()); - } else if (type.equals("sone")) { - Sone sone = webInterface.getCore().getSone(id, false); - if (sone == null) { + } else { + Optional 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);