X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FFollowSonePage.java;h=0652a522cfb290e36f3eaf45278d85d9b08ec4a9;hp=4083b9985eb34e414109c722c806697f88648c97;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=7d5aff5d52afa5d9725ce252c846b1aca6f1a761

diff --git a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
index 4083b99..0652a52 100644
--- a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FollowSonePage.java - Copyright © 2010 David Roden
+ * Sone - FollowSonePage.java - Copyright © 2010–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
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import com.google.common.base.Optional;
+
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
@@ -48,16 +50,16 @@ public class FollowSonePage 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 {
 		if (request.getMethod() == Method.POST) {
 			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String soneIds = request.getHttpRequest().getPartAsStringFailsafe("sone", 1200);
 			for (String soneId : soneIds.split("[ ,]+")) {
-				if (webInterface.getCore().hasSone(soneId)) {
+				Optional<Sone> sone = webInterface.getCore().getSone(soneId);
+				if (sone.isPresent()) {
 					webInterface.getCore().followSone(currentSone, soneId);
-					webInterface.getCore().markSoneKnown(webInterface.getCore().getSone(soneId));
+					webInterface.getCore().markSoneKnown(sone.get());
 				}
 			}
 			throw new RedirectException(returnPage);