X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=a74132230a584cc900b4529bd841029747f48c81;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=d2e7abebd0b41a432980ff40bdacf792294ce503;hpb=224be7a31fee673fa438cb02c4bb2105d01a52cc;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index d2e7abe..a741322 100644
--- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@ -30,6 +30,7 @@ import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
@@ -73,22 +74,22 @@ public class KnownSonesPage extends SoneTemplatePage {
 		templateContext.set("sort", sortField);
 		templateContext.set("order", sortOrder);
 		templateContext.set("filter", filter);
-		final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
+		final Optional<Sone> currentSone = getCurrentSone(request.getToadletContext(), false);
 		Collection<Sone> knownSones = Collections2.filter(webInterface.getCore().getSones(), Sone.EMPTY_SONE_FILTER);
-		if ((currentSone != null) && "followed".equals(filter)) {
+		if (currentSone.isPresent() && "followed".equals(filter)) {
 			knownSones = Collections2.filter(knownSones, new Predicate<Sone>() {
 
 				@Override
 				public boolean apply(Sone sone) {
-					return currentSone.hasFriend(sone.getId());
+					return currentSone.get().hasFriend(sone.getId());
 				}
 			});
-		} else if ((currentSone != null) && "not-followed".equals(filter)) {
+		} else if (currentSone.isPresent() && "not-followed".equals(filter)) {
 			knownSones = Collections2.filter(knownSones, new Predicate<Sone>() {
 
 				@Override
 				public boolean apply(Sone sone) {
-					return !currentSone.hasFriend(sone.getId());
+					return !currentSone.get().hasFriend(sone.getId());
 				}
 			});
 		} else if ("new".equals(filter)) {