X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FFollowSonePage.java;h=0b98a1a8e20afb7c9424f7f7d294d4247a5f5345;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=661ddd3929a52ecb1b6669079055a6d502e59c01;hpb=480691a26222e035e53bda56029524e160fdf898;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
index 661ddd3..0b98a1a 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–2012 David Roden
+ * Sone - FollowSonePage.java - Copyright © 2010–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
@@ -23,6 +23,8 @@ import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
 
+import com.google.common.base.Optional;
+
 /**
  * This page lets the user follow another Sone.
  *
@@ -44,9 +46,6 @@ public class FollowSonePage extends SoneTemplatePage {
 	// TEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
@@ -55,9 +54,10 @@ public class FollowSonePage extends SoneTemplatePage {
 			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);